Merge pull request #338 from wraythex/rm-patch-7

Update forms, moves, and items
cecpk · Oct 10, 2024 · 13ca030 · 13ca030
2 parents 7889b99 + 4f78441
commit 13ca030
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 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
@@ -81,6 +81,7 @@ message PokemonDisplayProto {
 		SPRING_2024 = 75;
 		SUMMER_2024 = 77;
 		ANNIVERSARY_2024 = 78;
+		FALL_2024 = 79;
 	}
 
 	enum Form {
@@ -2447,6 +2448,7 @@ message PokemonDisplayProto {
 		EEVEE_GOFEST_2024_MTIARA = 2846;
 		ESPEON_GOFEST_2024_SSCARF = 2847;
 		UMBREON_GOFEST_2024_MSCARF = 2848;
+		SNORLAX_WILDAREA_2024 = 2849;
 		OINKOLOGNE_NORMAL = 2981;
 		OINKOLOGNE_FEMALE = 2982;
 		MAUSHOLD_FAMILY_OF_THREE = 2983;
@@ -2480,6 +2482,7 @@ message PokemonDisplayProto {
 		PIKACHU_JEJU = 3012;
 		PIKACHU_DOCTOR = 3013;
 		PIKACHU_WCS_2023 = 3014;
+		PIKACHU_WCS_2024 = 3015;
 	}
 
 	Costume costume = 1;

diff --git a/static/data/items.json b/static/data/items.json
@@ -26,6 +26,9 @@
   "7": {
     "name": "Wild Ball"
   },
+  "8": {
+    "name": "Wild Ball Premier"
+  },
   "87": {
     "name": "Mega Energy",
     "questBundles": [5, 10, 15, 20, 25, 50, 70]
@@ -292,10 +295,10 @@
     "name": "Purified Gem"
   },
   "1506": {
-    "name": "Item MP"
+    "name": "Max Particles"
   },
   "1507": {
-    "name": "Item MP Replenish"
+    "name": "Max Particle Pack"
   },
   "1600": {
     "name": "Global Event Ticket"

diff --git a/static/data/moves.json b/static/data/moves.json
@@ -1375,8 +1375,24 @@
     "name": "Moongeist Beam",
     "type": "Ghost"
   },
+  "406": {
+    "name": "Aura Wheel Electric",
+    "type": "Electric"
+  },
+  "407": {
+    "name": "Aura Wheel Dark",
+    "type": "Dark"
+  },
   "408": {
     "name": "High Jump Kick",
     "type": "Fighting"
+  },
+  "462": {
+    "name": "Force Palm",
+    "type": "Fighting"
+  },
+  "463": {
+    "name": "Sparkling Aria",
+    "type": "Water"
   }
 }