Merge pull request #332 from wraythex/update-protos-2024-02-05

Add new forms and moves
cecpk · Feb 5, 2024 · a6bdc9b · a6bdc9b
2 parents 0c6c7d6 + 49b47eb
commit a6bdc9b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/rocketmad/pogo_protos_pb2.py b/rocketmad/pogo_protos_pb2.py
diff --git a/scripts/protos/vdisplayproto.proto b/scripts/protos/vdisplayproto.proto
@@ -78,6 +78,7 @@ message PokemonDisplayProto {
 		PI_NOEVOLVE = 72;
 		HOLIDAY_2023 = 73;
 		JAN_2024 = 74;
+		SPRING_2024 = 75;
 	}
 
 	enum Form {
@@ -2437,6 +2438,7 @@ message PokemonDisplayProto {
 		PIKACHU_FLYING_06 = 2839;
 		PIKACHU_FLYING_07 = 2840;
 		PIKACHU_FLYING_08 = 2841;
+		PIKACHU_HORIZONS = 2842;
 		OINKOLOGNE_NORMAL = 2981;
 		OINKOLOGNE_FEMALE = 2982;
 		MAUSHOLD_FAMILY_OF_THREE = 2983;

diff --git a/static/data/moves.json b/static/data/moves.json
@@ -1312,7 +1312,7 @@
     "type": "Flying"
   },
   "390": {
-    "name": "Natures Madness",
+    "name": "Nature's Madness",
     "type": "Fairy"
   },
   "391": {
@@ -1346,5 +1346,25 @@
   "398": {
     "name": "Spirit Shackle",
     "type": "Ghost"
+  },
+  "399": {
+    "name": "Volt Tackle",
+    "type": "Electric"
+  },
+  "400": {
+    "name": "Darkest Lariat",
+    "type": "Dark"
+  },
+  "401": {
+    "name": "Psywave",
+    "type": "Psychic"
+  },
+  "402": {
+    "name": "Metal Sound",
+    "type": "Steel"
+  },
+  "403": {
+    "name": "Sand Attack",
+    "type": "Ground"
   }
 }
diff --git a/static/data/pokemon.json b/static/data/pokemon.json
@@ -822,6 +822,10 @@
         "formName": "Flying 8",
         "genderDiff": true
       },
+      "2842": {
+        "formName": "Horizons",
+        "genderDiff": true
+      },
       "3002": {
         "formName": "Summer 2023 A",
         "genderDiff": true