Jelajahi Sumber

Revert "Fix Nidoran issue"

This reverts commit d7bcf8805ad8bc9103fe78b60a76162394f660a4.
Kris Bahnsen 2 tahun lalu
induk
melakukan
d1f4ce57e6
2 mengubah file dengan 4 tambahan dan 4 penghapusan
  1. 2 2
      pokemon_app.cpp
  2. 2 2
      views/trade.cpp

+ 2 - 2
pokemon_app.cpp

@@ -29,10 +29,10 @@ struct pokemon_lut pokemon_table[] = {
     {"Raichu", &I_raichu, 0x55, 0x17, 0xFF, 2, 60, 90, 55, 100, 90},
     {"Raichu", &I_raichu, 0x55, 0x17, 0xFF, 2, 60, 90, 55, 100, 90},
     {"Sandshrew", &I_sandshrew, 0x60, 0x04, 0xFF, 2, 50, 75, 85, 40, 30},
     {"Sandshrew", &I_sandshrew, 0x60, 0x04, 0xFF, 2, 50, 75, 85, 40, 30},
     {"Sandslash", &I_sandslash, 0x61, 0x04, 0xFF, 2, 75, 100, 110, 65, 55},
     {"Sandslash", &I_sandslash, 0x61, 0x04, 0xFF, 2, 75, 100, 110, 65, 55},
-    {"Nidoran♀", &I_nidoranf, 0x0F, 0x03, 0xFF, 1, 55, 47, 52, 41, 40},
+    {"Nidoran ♀", &I_nidoranf, 0x0F, 0x03, 0xFF, 1, 55, 47, 52, 41, 40},
     {"Nidorina", &I_nidorina, 0xA8, 0x03, 0xFF, 1, 70, 62, 67, 56, 55},
     {"Nidorina", &I_nidorina, 0xA8, 0x03, 0xFF, 1, 70, 62, 67, 56, 55},
     {"Nidoqueen", &I_nidoqueen, 0x10, 0x03, 0x04, 1, 90, 82, 87, 76, 75},
     {"Nidoqueen", &I_nidoqueen, 0x10, 0x03, 0x04, 1, 90, 82, 87, 76, 75},
-    {"Nidoran♂", &I_nidoranm, 0x03, 0x03, 0xFF, 1, 46, 57, 40, 50, 40},
+    {"Nidoran ♂", &I_nidoranm, 0x03, 0x03, 0xFF, 1, 46, 57, 40, 50, 40},
     {"Nidorino", &I_nidorino, 0xA7, 0x03, 0xFF, 1, 61, 72, 57, 65, 55},
     {"Nidorino", &I_nidorino, 0xA7, 0x03, 0xFF, 1, 61, 72, 57, 65, 55},
     {"Nidoking", &I_nidoking, 0x07, 0x03, 0x04, 1, 81, 92, 77, 85, 75},
     {"Nidoking", &I_nidoking, 0x07, 0x03, 0x04, 1, 81, 92, 77, 85, 75},
     {"Clefairy", &I_clefairy, 0x04, 0x00, 0xFF, 3, 70, 45, 48, 35, 60},
     {"Clefairy", &I_clefairy, 0x04, 0x00, 0xFF, 3, 70, 45, 48, 35, 60},

+ 2 - 2
views/trade.cpp

@@ -356,8 +356,8 @@ unsigned char convertCharToTagHex(char c) {
         case ' ': return SPACE_;
         case ' ': return SPACE_;
         case '.': return PERIOD_;
         case '.': return PERIOD_;
         case '\'': return S_QUOTE_;
         case '\'': return S_QUOTE_;
-        case '\u2642': return MALE_;
-        case '\u2640': return FEMALE_;
+        case '': return MALE_;
+        case '': return FEMALE_;
         default:  return 0x00;
         default:  return 0x00;
     }
     }