Forty (#677)

profezzorn · Jul 21, 2024 · 4bf9bdb · 4bf9bdb
1 parent e819e05
commit 4bf9bdb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pqoi/readme.md b/pqoi/readme.md
@@ -178,14 +178,14 @@ file 20.png
 if A<10 goto blink
 if A<40 goto twenty
 
-label fourty
+label forty
 file 40.png
 if A<40 goto twenty
-if A<60 goto fourty
+if A<60 goto forty
 
 label sixty
 file 60.png
-if A<60 goto fourty
+if A<60 goto forty
 if A<80 goto sixty
 
 label eighty

diff --git a/sound/sound_library.h b/sound/sound_library.h
@@ -200,7 +200,7 @@ class SoundLibraryTemplate : public SoundQueue<16> {
   ADD_SL_SOUND(19, "mnum/mnum19");
   ADD_SL_SOUND(20, "mnum/mnum20");
   ADD_SL_SOUND(30, "thirty");
-  ADD_SL_SOUND(40, "fourty");
+  ADD_SL_SOUND(40, "forty");
   ADD_SL_SOUND(50, "fifty");
   ADD_SL_SOUND(60, "sixty");
   ADD_SL_SOUND(70, "seventy");

diff --git a/sound/talkie.h b/sound/talkie.h
@@ -739,7 +739,7 @@ class Talkie : public ProffieOSAudioStream
       case 7: Say(spSEVENTY); break;
       case 6: Say(spSIXTY); break;
       case 5: Say(spFIFTY); break;
-      case 4: Say(spFOURTY); break;
+      case 4: Say(spFORTY); break;
       case 3: Say(spTHIRTY); break;
       case 2: Say(spTWENTY); break;
       case 1:

diff --git a/sound/voice_data.h b/sound/voice_data.h
@@ -40,7 +40,7 @@ const uint8_t spEIGHTEEN[] = {0x0c,0x58,0x5e,0xb4,0x99,0x8d,0x4b,0xf5,0xa8,0xe4,
 const uint8_t spNINETEEN[] = {0x40,0x5c,0x34,0x2a,0x55,0x35,0xa1,0x72,0x69,0xed,0x32,0x93,0x94,0xc5,0xf1,0xc6,0xa3,0x5b,0x14,0x0f,0x27,0x7a,0x8d,0x4e,0x49,0x32,0x9c,0x1c,0x55,0xb3,0x35,0xc9,0x70,0x52,0x54,0xeb,0xd6,0xc4,0xc3,0x49,0x51,0xa2,0xca,0xe2,0x0c,0x27,0x59,0x8f,0x68,0xb3,0x33,0x9c,0xa4,0xac,0x32,0xd5,0x49,0x71,0x13,0xf3,0x49,0xd1,0xb6,0xce,0xf5,0x3c,0xb6,0xd8,0x92,0x8a,0xd5,0xea,0xec,0x70,0x57,0x42,0xdc,0xa0,0x23,0xd3,0xc3,0x89,0x01,0xa6,0x34,0x33,0xc0,0x0e,0xa1,0xc9,0x69,0x58,0xa2,0xdb,0x12,0x25,0x37,0xd0,0x98,0x69,0xb5,0x9c,0xbc,0xc0,0x72,0xc7,0xd0,0x49,0x09,0x02,0xcd,0x6d,0xc3,0x24,0x25,0x0c,0x2c,0xb7,0x15,0x92,0xa4,0x28,0x11,0xdf,0x31,0x68,0x92,0x62,0x2f,0xe6,0x4a,0x28,0x4d,0x88,0x23,0xb1,0x2d,0x91,0xb6,0x21,0x0e,0x34,0x2e,0x45,0xda,0x86,0xc4,0x8b,0xba,0x10,0x69,0xec,0x12,0xad,0xe7,0x82,0xb5,0xb1,0x49,0x94,0xeb,0x65,0xcd,0x5a,0x2c,0x61,0x37,0x4d,0x22,0x2c,0xaa,0x44,0x9b,0xae,0x4e,0x54,0x22,0x52,0x65,0xba,0xcb,0xc9,0x89,0x48,0x13,0x53,0xab,0x61,0xba,0x28,0x09,0x54,0x2c,0x5b,0xe5,0x02,0x00,0xc0,0x03};
 const uint8_t spTWENTY[] = {0x20,0x80,0x9b,0x33,0x04,0x70,0xe3,0x8c,0xd9,0x86,0x9d,0xac,0x72,0xdb,0xca,0xea,0xae,0x62,0xd2,0xec,0x88,0x26,0xe8,0xf6,0x50,0x4f,0xe2,0x5c,0x3f,0x0a,0x73,0x4a,0x6a,0x73,0x53,0x6b,0xb2,0x2a,0x6b,0xc3,0x2b,0x3e,0xcc,0xb2,0x94,0x0e,0xaf,0x6a,0x0d,0xef,0x90,0x53,0xfc,0xc2,0x35,0x73,0x5c,0x8e,0xf1,0xb4,0xae,0xae,0x35,0x26,0xc4,0x23,0xa7,0xab,0x8c,0x3c,0x23,0x9f,0xe4,0xcd,0x36,0x51,0x4c,0x80,0x63,0x4a,0x19,0x70,0xc2,0x9a,0x71,0x03,0x8d,0xb9,0x35,0x4a,0xc6,0x8b,0xd4,0xf6,0x9e,0xe9,0x18,0x3f,0x30,0xdb,0x1b,0xa2,0xab,0xfc,0x40,0xf3,0x6e,0x59,0x2a,0xf3,0x3c,0xab,0xbb,0x45,0x29,0xc8,0xf1,0xac,0xf6,0x0c,0xe8,0x20,0x67,0x30,0xd4,0x3d,0x97,0x02,0x00,0x00,0x0f};
 const uint8_t spTHIRTY[] = {0xc0,0xf4,0x22,0xdc,0xdd,0xc3,0x89,0xd2,0xa7,0x76,0x35,0x37,0x27,0x04,0x58,0x3e,0x3d,0xa8,0x5d,0xbb,0x45,0xa4,0xbd,0xe6,0x65,0x2d,0x31,0xdd,0xa1,0x87,0x9f,0x1d,0xfb,0xe4,0x94,0x69,0x7e,0x8e,0x14,0xeb,0x53,0xb6,0xf8,0x39,0x62,0xae,0x4d,0x99,0xe6,0x97,0x88,0x35,0xb1,0x41,0x5b,0x50,0x3d,0x66,0xd7,0x84,0x76,0x41,0x31,0x58,0xb9,0x15,0x39,0xf9,0x5d,0xb0,0xd6,0x76,0xe4,0x12,0x14,0x2e,0x7d,0x1b,0x64,0x52,0x90,0x99,0xcc,0x8d,0xd0,0x09,0x7e,0xa6,0x32,0x3f,0x42,0xc7,0x78,0x91,0xfa,0xfe,0x32,0x53,0xe5,0x04,0x96,0xfb,0x83,0x54,0x99,0x65,0x45,0xdf,0x10,0x28,0x25,0x56,0x45,0xd4,0xdf,0x0c,0x05,0x00,0x00,0x00,0x1e};
-const uint8_t spFOURTY[] = {0x04,0x98,0xb6,0xcc,0x6d,0x33,0x74,0x64,0x9a,0xed,0xe2,0x0c,0x9f,0xd1,0xa9,0x76,0x8a,0x53,0x54,0x78,0xb8,0xc6,0x75,0x9e,0x79,0xcc,0x53,0x63,0xda,0x05,0xf6,0x62,0x76,0x9d,0xd8,0x10,0x84,0x85,0x9d,0xb5,0x4c,0x4b,0x10,0x2b,0x55,0xc4,0xd8,0x6b,0x41,0xf6,0x54,0x55,0x53,0x25,0x05,0xc5,0x62,0xc7,0x65,0x68,0x17,0x0c,0xcd,0xe2,0xdd,0x91,0x53,0x90,0x84,0xce,0xac,0x50,0x0e,0x41,0xe6,0xb2,0xbb,0x4c,0x25,0xf8,0x89,0xca,0xee,0x30,0x5d,0xe3,0x25,0x2a,0xf7,0xc3,0xf4,0x94,0xeb,0x79,0xde,0x37,0xd1,0x65,0xb6,0x67,0x75,0xab,0x40,0x97,0x58,0x09,0xc9,0x5e,0x20,0x6d,0x64,0x0f,0x8e,0x52,0x97,0x52,0x00,0xe0,0x01};
+const uint8_t spFORTY[] = {0x04,0x98,0xb6,0xcc,0x6d,0x33,0x74,0x64,0x9a,0xed,0xe2,0x0c,0x9f,0xd1,0xa9,0x76,0x8a,0x53,0x54,0x78,0xb8,0xc6,0x75,0x9e,0x79,0xcc,0x53,0x63,0xda,0x05,0xf6,0x62,0x76,0x9d,0xd8,0x10,0x84,0x85,0x9d,0xb5,0x4c,0x4b,0x10,0x2b,0x55,0xc4,0xd8,0x6b,0x41,0xf6,0x54,0x55,0x53,0x25,0x05,0xc5,0x62,0xc7,0x65,0x68,0x17,0x0c,0xcd,0xe2,0xdd,0x91,0x53,0x90,0x84,0xce,0xac,0x50,0x0e,0x41,0xe6,0xb2,0xbb,0x4c,0x25,0xf8,0x89,0xca,0xee,0x30,0x5d,0xe3,0x25,0x2a,0xf7,0xc3,0xf4,0x94,0xeb,0x79,0xde,0x37,0xd1,0x65,0xb6,0x67,0x75,0xab,0x40,0x97,0x58,0x09,0xc9,0x5e,0x20,0x6d,0x64,0x0f,0x8e,0x52,0x97,0x52,0x00,0xe0,0x01};
 const uint8_t spFIFTY[] = {0x00,0x40,0x80,0x15,0xca,0x0d,0x30,0x73,0x47,0x33,0xab,0xe2,0xc8,0x6b,0xc7,0xc3,0xce,0x82,0xbb,0xbf,0x1c,0x0f,0xa7,0x48,0xca,0xfe,0x74,0x52,0x9c,0x24,0xb8,0xfb,0x5d,0xb2,0xf3,0x2a,0x53,0xc9,0x99,0xd8,0x0a,0xd8,0xbe,0x8d,0x01,0x27,0xb6,0x83,0x00,0xae,0x75,0x4f,0xce,0xa0,0x6c,0xb5,0x15,0x27,0x78,0x91,0xe9,0xde,0x9b,0xe4,0xe0,0x27,0xca,0x7b,0xcf,0x4c,0x9d,0x1f,0xa8,0xdf,0x2e,0x2a,0x35,0xbe,0xa7,0x79,0xd7,0xa8,0x44,0xb8,0x4a,0xcf,0x9d,0x83,0x52,0x66,0x3b,0xde,0xb7,0x0a,0x4a,0x91,0xdd,0x30,0xe6,0xad,0x52,0x46,0x76,0x23,0xa4,0xbd,0x21,0x07,0x00,0x00,0x00,0x1e};
 const uint8_t spSIXTY[] = {0x80,0xa6,0x69,0x53,0xdd,0xd3,0x2e,0x02,0xa6,0x49,0x25,0xc0,0xd2,0x65,0x06,0x58,0xa6,0xdd,0x00,0xcb,0x56,0x38,0x60,0xd9,0xf2,0x34,0x4d,0x57,0xee,0xe9,0x76,0x8a,0xde,0x95,0x4b,0x64,0xd8,0x6b,0x66,0x92,0xd2,0xf5,0x25,0xbb,0x59,0x45,0x50,0xcf,0xb7,0xed,0xe4,0x64,0x41,0x3b,0x17,0xb2,0x89,0x6d,0x55,0xcd,0x39,0x8b,0x11,0x6f,0xf5,0xc1,0xee,0x66,0x37,0xe8,0x3d,0xac,0x69,0x5a,0x54,0x03,0x4c,0xb7,0x61,0x80,0x65,0xdb,0x0d,0xb0,0x6d,0x39,0x01,0xb6,0x49,0x33,0xc0,0xb6,0x6d,0xc9,0xee,0x4c,0xa4,0x66,0xe2,0x04,0x27,0x31,0xd9,0xbb,0xa4,0x1d,0xdc,0x44,0x75,0xef,0x53,0xb2,0x73,0x23,0xb3,0xfb,0x77,0x49,0xc6,0x0d,0xcc,0xef,0x4f,0x28,0x0b,0xdb,0x89,0xbe,0x75,0x60,0xca,0xac,0x40,0xf2,0x56,0x81,0x0e,0xb2,0x3b,0x41,0x9d,0x4b,0xd1,0xc8,0x6a,0x94,0xa4,0x27,0x12,0x03,0x00,0x3c};
 const uint8_t spSEVENTY[] = {0x00,0xe8,0x1a,0x26,0xd4,0x23,0x93,0x30,0x7d,0x9a,0x34,0x4f,0x8f,0xcb,0x80,0x65,0xcb,0x04,0x30,0x4d,0x99,0x00,0x96,0x69,0x37,0xcf,0xb0,0xe5,0x91,0x6e,0x27,0x98,0x55,0x98,0x56,0x47,0xdc,0xe1,0x66,0xa5,0x95,0x17,0x94,0x97,0x5f,0xb4,0x56,0x5d,0xc8,0x5e,0x41,0xd6,0xd6,0x35,0x21,0xa5,0x84,0xc9,0x68,0xf9,0x26,0x65,0xf5,0x27,0x61,0x9e,0x59,0x51,0x8a,0x9f,0xa5,0x64,0x6e,0xcb,0x6e,0x41,0x16,0x9a,0x75,0x45,0xd9,0x05,0xd2,0x56,0x77,0x2b,0x53,0x11,0xd0,0x99,0x53,0x46,0x5a,0x4c,0x18,0x68,0x54,0x4f,0x3a,0x4d,0x7e,0x62,0x52,0xb3,0x21,0x3b,0xf9,0x89,0xeb,0xce,0xa2,0x9c,0xe4,0x67,0x26,0xbb,0x83,0x72,0x9c,0x1f,0xa9,0xde,0x0e,0x28,0x55,0x5e,0x60,0x71,0xb7,0xa0,0x4c,0x38,0x81,0xe6,0x5d,0x02,0x12,0x62,0x77,0x8c,0x75,0xa7,0x94,0x11,0x30,0x25,0x0a,0x00,0xc0,0x03};
@@ -83,7 +83,7 @@ const uint8_t spEIGHTEEN[] = {0x6B,0x18,0x36,0x88,0x3B,0x1B,0xEF,0x61,0x0D,0xD3,
 const uint8_t spNINETEEN[] = {0x6E,0x2F,0x44,0xB4,0x5B,0x93,0xA6,0xAD,0x32,0x96,0x2E,0x69,0xBA,0x96,0x26,0xD3,0xCC,0x65,0xF1,0x1A,0x9B,0x9C,0xE0,0xD4,0x2D,0x6B,0x68,0xA6,0xCD,0xCA,0x56,0xAF,0xAE,0xB9,0x64,0x6F,0x5F,0xB4,0xEA,0xE6,0x84,0xA7,0xA3,0x52,0xAB,0x5B,0x40,0xAB,0x28,0xD3,0xAE,0xCD,0x0A,0xC7,0x5D,0x35,0x23,0x70,0x8A,0x52,0x15,0xAA,0x01,0x50,0x80,0xAB,0x4C,0x0A,0xB0,0x7C,0x4B,0xCB,0x57,0xDE,0x4C,0x43,0x4D,0xAD,0x6A,0x96,0x38,0x6B,0x62,0xAE,0x7A,0x16,0x27,0xCA,0x98,0xB5,0x9A,0x19,0x0D,0x79,0xB2,0xF4,0xEA,0xA7,0x57,0xD4,0x8D,0xC0,0x63,0x5E,0xD6,0x48,0xCF,0x8D,0x94,0x6D,0x19,0x45,0xBD,0x0C,0x54,0xF6,0x21,0x84,0xE2,0xDC,0x74,0x79,0x9A,0x86,0x1A,0x57,0xBB,0xE5,0x2D,0x0A,0xBB,0xD4,0x1D,0x95,0xBF,0x3B,0xAC,0x50,0x73,0x5C,0xFE,0xEE,0x28,0xCD,0xDD,0x55,0xF8,0xAB,0x33,0x0B,0xED,0x59,0xFF,0x0F};
 const uint8_t spTWENTY[] = {0x0A,0xE8,0x4A,0xCD,0x01,0xDB,0xB9,0x33,0xC0,0xA6,0x54,0x0C,0xA4,0x34,0xD9,0xF2,0x0A,0x6C,0xBB,0xB3,0x53,0x0E,0x5D,0xA6,0x25,0x9B,0x6F,0x75,0xCA,0x61,0x52,0xDC,0x74,0x49,0xA9,0x8A,0xC4,0x76,0x4D,0xD7,0xB1,0x76,0xC0,0x55,0xA6,0x65,0xD8,0x26,0x99,0x5C,0x56,0xAD,0xB9,0x25,0x23,0xD5,0x7C,0x32,0x96,0xE9,0x9B,0x20,0x7D,0xCB,0x3C,0xFA,0x55,0xAE,0x99,0x1A,0x30,0xFC,0x4B,0x3C,0xFF,0x1F};
 const uint8_t spTHIRTY[] = {0x02,0x18,0xA2,0x52,0x02,0x16,0x60,0xC0,0x50,0x13,0x25,0x6B,0x2C,0xC4,0xDC,0x52,0xAF,0xB2,0x8B,0x70,0x2A,0xCD,0xBA,0xAA,0xAA,0xC7,0x60,0xCC,0xFD,0xAA,0x8B,0x5D,0x85,0x35,0xED,0xA3,0x2B,0xD3,0x31,0x52,0xF2,0x2A,0xA0,0x7A,0xA5,0x00,0x2C,0xED,0xD2,0xFA,0x9E,0x8C,0x45,0x7D,0xF5,0xD8,0xBA,0x55,0xB2,0xAC,0xD5,0xED,0xE8,0xDE,0x51,0x2A,0x57,0x97,0xA7,0x07,0x41,0xAF,0x5A,0xEC,0xB6,0xEE,0x19,0x7D,0x7A,0xB1,0x9B,0xBA,0x23,0xCC,0xE9,0x5A,0xFF,0x0F};
-const uint8_t spFOURTY[] = {0x04,0xC8,0xCE,0x8C,0x01,0xCB,0x94,0x33,0x60,0xDA,0x0C,0x01,0x0C,0x13,0xAE,0x80,0xEA,0xD3,0x4A,0x1D,0xC4,0xB4,0x26,0x39,0x1E,0x75,0xA2,0xB3,0x9C,0xAC,0x7E,0x54,0x51,0xEC,0x52,0xAA,0xFA,0x51,0x05,0x73,0xC1,0xE5,0xDC,0x47,0x9D,0xC2,0x8A,0xB5,0x6A,0x57,0x40,0xF5,0x4A,0x01,0x58,0xDA,0xA5,0x8D,0xC3,0x24,0x89,0x5B,0xAF,0xB1,0xB4,0x20,0xE4,0x5E,0x8B,0xC7,0xDA,0x9D,0xA3,0x54,0xBE,0x4E,0xF7,0x8C,0x41,0x98,0xF1,0xC6,0x3D,0x3D,0x0A,0xEA,0xF4,0x23,0xF7,0x34,0x47,0x9C,0x53,0x93,0xDC,0xD3,0x15,0x63,0x6D,0x4D,0x32,0xCF,0x98,0x41,0xA4,0xB9,0xF8,0xFF,0x01};
+const uint8_t spFORTY[] = {0x04,0xC8,0xCE,0x8C,0x01,0xCB,0x94,0x33,0x60,0xDA,0x0C,0x01,0x0C,0x13,0xAE,0x80,0xEA,0xD3,0x4A,0x1D,0xC4,0xB4,0x26,0x39,0x1E,0x75,0xA2,0xB3,0x9C,0xAC,0x7E,0x54,0x51,0xEC,0x52,0xAA,0xFA,0x51,0x05,0x73,0xC1,0xE5,0xDC,0x47,0x9D,0xC2,0x8A,0xB5,0x6A,0x57,0x40,0xF5,0x4A,0x01,0x58,0xDA,0xA5,0x8D,0xC3,0x24,0x89,0x5B,0xAF,0xB1,0xB4,0x20,0xE4,0x5E,0x8B,0xC7,0xDA,0x9D,0xA3,0x54,0xBE,0x4E,0xF7,0x8C,0x41,0x98,0xF1,0xC6,0x3D,0x3D,0x0A,0xEA,0xF4,0x23,0xF7,0x34,0x47,0x9C,0x53,0x93,0xDC,0xD3,0x15,0x63,0x6D,0x4D,0x32,0xCF,0x98,0x41,0xA4,0xB9,0xF8,0xFF,0x01};
 const uint8_t spFIFTY[] = {0x08,0x68,0x3A,0x05,0x01,0x5D,0xA4,0x12,0x60,0xD8,0x0A,0x02,0x4C,0x5F,0x21,0x80,0xE9,0xD2,0x15,0xD0,0x6C,0xD9,0x4A,0x9B,0x09,0x91,0x94,0x2D,0x2B,0xEF,0x2A,0x95,0x52,0x37,0xAF,0xA2,0xD9,0x52,0x09,0xFD,0x4C,0x80,0x61,0x2B,0x08,0x30,0x7D,0x85,0x00,0xA6,0x4B,0x47,0xE0,0x14,0xA5,0x2A,0x54,0x03,0x0A,0x30,0x74,0xD9,0xE8,0xBB,0x34,0xF2,0x8C,0xD5,0x63,0xE9,0x56,0x49,0x2B,0x1F,0xAF,0x6D,0x04,0x27,0xAA,0x58,0x53,0xEE,0x19,0x93,0x30,0xFD,0x4B,0xB9,0x67,0x70,0xE4,0xAA,0xD5,0xEE,0x6D,0x96,0xB1,0xA6,0x66,0x87,0xB7,0x67,0x22,0x8F,0xA9,0xFD,0xFF};
 const uint8_t spSIXTY[] = {0x06,0x78,0x90,0xC4,0x00,0x3F,0x66,0x18,0xE0,0xA7,0x8C,0x04,0x7C,0x9F,0x11,0x80,0xDF,0xDA,0x57,0xD1,0x5D,0xBB,0x2B,0x2D,0x59,0x45,0x6B,0xA9,0xC6,0xB2,0xA6,0x14,0xAD,0x9B,0x18,0x59,0x17,0x04,0x4E,0x51,0xAA,0x42,0x35,0x40,0x01,0x35,0x8D,0x17,0xE0,0xC4,0x9A,0x02,0xBC,0x54,0x85,0xC0,0x29,0x4A,0x55,0xA8,0x06,0x04,0x60,0x48,0x37,0x07,0x6C,0xAE,0xB6,0xAA,0xA9,0x53,0x54,0xA5,0xCB,0xAA,0xBB,0x4B,0x12,0xB7,0x37,0x6B,0x18,0x31,0x51,0xDC,0x5F,0xAF,0x79,0x34,0x47,0xD1,0x58,0x3D,0xD6,0xD1,0x14,0xD5,0x72,0x71,0xDB,0x47,0x51,0xD4,0xC8,0xD7,0xFF,0x0F};
 const uint8_t spSEVENTY[] = {0x0C,0xF8,0x29,0x45,0x01,0xBF,0x95,0x5A,0x20,0x00,0xBF,0xA5,0x3A,0xE0,0x97,0x32,0x03,0xFC,0x5C,0xB6,0x8A,0x2E,0x42,0xDD,0x6C,0xD3,0x2A,0x3B,0x2F,0xD3,0xB4,0xCD,0xAB,0xCA,0xA6,0xD4,0x2B,0x37,0xB5,0x3A,0x3A,0x8F,0x10,0x5B,0x99,0xFA,0x6C,0xC3,0xCC,0x78,0xD5,0x6A,0x8A,0x0D,0x0B,0xF5,0x47,0x63,0xAC,0x9A,0x33,0xC5,0x63,0xA7,0xB1,0x2A,0xEC,0x50,0xD7,0x9C,0x96,0x66,0xB0,0x92,0xC2,0x95,0x01,0x9E,0x32,0x2D,0xDB,0x0B,0xE3,0xE2,0xAC,0xAD,0xED,0x4D,0x39,0xB9,0xD5,0xC6,0xB5,0x0F,0x13,0xCC,0xE1,0x9B,0xC7,0xD1,0x9D,0x93,0x66,0x7C,0x2E,0xE7,0x70,0x49,0x94,0xBE,0xA5,0x5C,0xC3,0x25,0x72,0xC5,0xA6,0x72,0x0F,0xEF,0x28,0x59,0xAB,0xDD,0x3D,0xAA,0x91,0x58,0xAD,0xFA,0x7F};