npm - @pkmn/engine - Versions diffs - 0.1.0-dev.f3aaee39 → 0.1.0-dev.f3b63b86 - Mend

@pkmn/engine 0.1.0-dev.f3aaee39 → 0.1.0-dev.f3b63b86

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (85) hide show

package/LICENSE +1 -3
package/README.md +77 -23
package/build/pkg/addon/browser.d.ts +3 -0
package/build/pkg/addon/browser.js +47 -0
package/build/pkg/addon/browser.js.map +1 -0
package/build/pkg/addon/node.d.ts +3 -0
package/build/pkg/addon/node.js +110 -0
package/build/pkg/addon/node.js.map +1 -0
package/build/pkg/addon/wasm.d.ts +2 -0
package/build/pkg/addon/wasm.js +53 -0
package/build/pkg/addon/wasm.js.map +1 -0
package/build/pkg/addon.d.ts +26 -4
package/build/pkg/addon.js +39 -71
package/build/pkg/addon.js.map +1 -1
package/build/pkg/data/ids.json +12 -12
package/build/pkg/data/layout.json +17 -4
package/build/pkg/data/protocol.json +84 -13
package/build/pkg/data.d.ts +27 -5
package/build/pkg/data.js.map +1 -1
package/build/pkg/gen1.d.ts +15 -18
package/build/pkg/gen1.js +30 -21
package/build/pkg/gen1.js.map +1 -1
package/build/pkg/index.d.ts +42 -91
package/build/pkg/index.js +23 -70
package/build/pkg/index.js.map +1 -1
package/build/pkg/protocol.d.ts +20 -1
package/build/pkg/protocol.js +123 -102
package/build/pkg/protocol.js.map +1 -1
package/build/tools/debug.js +69 -74
package/build/tools/debug.js.map +1 -1
package/build/tools/display/debug.jsx +152 -0
package/build/tools/display/debug.jsx.map +1 -0
package/build/tools/display/index.js +152 -0
package/build/tools/display/index.js.map +1 -0
package/build/tools/display/ui.jsx +359 -0
package/build/tools/display/ui.jsx.map +1 -0
package/build/tools/display/util.js +33 -0
package/build/tools/display/util.js.map +1 -0
package/build.zig +273 -120
package/package.json +64 -123
package/src/bin/install-pkmn-engine +47 -21
package/src/bin/pkmn-debug +1 -1
package/src/lib/bindings/c.zig +200 -0
package/src/lib/{binding → bindings}/node.zig +15 -32
package/src/lib/bindings/wasm.zig +50 -0
package/src/lib/common/array.zig +70 -0
package/src/lib/common/data.zig +12 -24
package/src/lib/common/debug.zig +32 -11
package/src/lib/common/js.zig +3 -7
package/src/lib/common/optional.zig +19 -18
package/src/lib/common/options.zig +6 -0
package/src/lib/common/protocol.zig +919 -430
package/src/lib/common/rational.zig +341 -254
package/src/lib/common/rng.zig +22 -15
package/src/lib/common/util.zig +33 -1
package/src/lib/gen1/calc.zig +706 -177
package/src/lib/gen1/chance.zig +428 -302
package/src/lib/gen1/data/moves.zig +193 -183
package/src/lib/gen1/data/species.zig +4 -6
package/src/lib/gen1/data/types.zig +9 -10
package/src/lib/gen1/data.zig +60 -75
package/src/lib/gen1/helpers.zig +90 -563
package/src/lib/gen1/mechanics.zig +682 -600
package/src/lib/gen2/calc.zig +150 -0
package/src/lib/gen2/chance.zig +896 -0
package/src/lib/gen2/data/items.zig +13 -21
package/src/lib/gen2/data/moves.zig +664 -572
package/src/lib/gen2/data/species.zig +2 -4
package/src/lib/gen2/data/types.zig +139 -34
package/src/lib/gen2/data.zig +121 -96
package/src/lib/gen2/generated.zig +801 -0
package/src/lib/gen2/helpers.zig +53 -38
package/src/lib/gen2/mechanics.zig +3580 -29
package/src/lib/napi.h +2 -0
package/src/lib/node.zig +14 -0
package/src/lib/pkmn.zig +125 -29
package/src/lib/wasm.zig +13 -0
package/src/tools/display/dom.ts +93 -0
package/src/tools/display/ui.css +354 -0
package/build/test/display.js +0 -400
package/build/test/display.js.map +0 -1
package/src/lib/binding/wasm.zig +0 -12
package/src/lib/gen1/README.md +0 -892
package/src/lib/gen2/README.md +0 -308
package/src/test/display/pkmn.html.tmpl +0 -368

package/src/lib/gen2/data/moves.zig CHANGED Viewed

@@ -1,11 +1,11 @@
-//! Code generated by `tools/generate` - manual edits will be overwritten
-const std = @import("std");
+//! Code generated by `tools/generate` - manual edits will be overwritten.
 const gen2 = @import("../../gen2/data.zig");
+const rng = @import("../../common/rng.zig");
+const std = @import("std");
 const assert = std.debug.assert;
+const percent = rng.Gen12.percent;
 const Type = gen2.Type;
 /// Representation of a Generation II Pokémon move.
@@ -271,17 +271,35 @@ pub const Move = enum(u8) {
         bp: u8,
         /// The move's type.
         type: Type,
-        /// The move's base PP.
-        pp: u8,
         /// The move's accuracy percentage.
         accuracy: u8,
         /// The move's targeting behavior.
         target: Target,
         /// The chance of the move's secondary effect occurring.
         chance: u8 = 0,
+        /// The priority of the move.
+        priority: i8 = 0,
+        /// Miscellaneous extra data/flags.
+        extra: Extra = .{},
+        /// Miscellaneous extra move related data/flags.
+        const Extra = packed struct(u8) {
+            /// Whether this move can be called via Metronome.
+            metronome: bool = true,
+            /// Whether this move can be called via Sleep Talk.
+            sleep_talk: bool = true,
+            /// Whether this move is considered to be "continuous".
+            continuous: bool = false,
+            /// Whether this move can hit a flying target.
+            flying: bool = false,
+            /// Whether this move can hit an underground target.
+            underground: bool = false,
+            /// Protocol reason offset associated with this move.
+            protocol: u3 = 0,
+        };
         comptime {
-            assert(@sizeOf(Data) == 7);
+            assert(@sizeOf(Data) == 8);
         }
     };
@@ -291,8 +309,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 40,
             .type = .Normal,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // KarateChop
@@ -300,8 +317,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 50,
             .type = .Fighting,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // DoubleSlap
@@ -309,8 +325,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 15,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // CometPunch
@@ -318,8 +333,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 18,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // MegaPunch
@@ -327,8 +341,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 80,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // PayDay
@@ -336,8 +349,7 @@ pub const Move = enum(u8) {
             .effect = .PayDay,
             .bp = 40,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // FirePunch
@@ -345,38 +357,34 @@ pub const Move = enum(u8) {
             .effect = .BurnChance,
             .bp = 75,
             .type = .Fire,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // IcePunch
         .{
             .effect = .FreezeChance,
             .bp = 75,
             .type = .Ice,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // ThunderPunch
         .{
             .effect = .ParalyzeChance,
             .bp = 75,
             .type = .Electric,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Scratch
         .{
             .effect = .None,
             .bp = 40,
             .type = .Normal,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // ViseGrip
@@ -384,8 +392,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 55,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Guillotine
@@ -393,8 +400,7 @@ pub const Move = enum(u8) {
             .effect = .OHKO,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 30,
+            .accuracy = percent(30),
             .target = .Other,
         },
         // RazorWind
@@ -402,17 +408,16 @@ pub const Move = enum(u8) {
             .effect = .RazorWind,
             .bp = 80,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Foes,
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // SwordsDance
         .{
             .effect = .AttackUp2,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Cut
@@ -420,8 +425,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 50,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
         },
         // Gust
@@ -429,17 +433,16 @@ pub const Move = enum(u8) {
             .effect = .Gust,
             .bp = 40,
             .type = .Flying,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Any,
+            .extra = .{ .flying = true },
         },
         // WingAttack
         .{
             .effect = .None,
             .bp = 60,
             .type = .Flying,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Any,
         },
         // Whirlwind
@@ -447,35 +450,35 @@ pub const Move = enum(u8) {
             .effect = .ForceSwitch,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .priority = -1,
+            .extra = .{ .flying = true },
         },
         // Fly
         .{
-            .effect = .Fly,
+            .effect = .FlyDig,
             .bp = 70,
             .type = .Flying,
-            .pp = 15,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Any,
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Bind
         .{
             .effect = .Binding,
             .bp = 15,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
+            .extra = .{ .protocol = 1 },
         },
         // Slam
         .{
             .effect = .None,
             .bp = 80,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // VineWhip
@@ -483,8 +486,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 35,
             .type = .Grass,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Stomp
@@ -492,18 +494,16 @@ pub const Move = enum(u8) {
             .effect = .Stomp,
             .bp = 65,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // DoubleKick
         .{
             .effect = .DoubleHit,
             .bp = 30,
             .type = .Fighting,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // MegaKick
@@ -511,8 +511,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 120,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // JumpKick
@@ -520,8 +519,7 @@ pub const Move = enum(u8) {
             .effect = .JumpKick,
             .bp = 70,
             .type = .Fighting,
-            .pp = 25,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
         },
         // RollingKick
@@ -529,18 +527,16 @@ pub const Move = enum(u8) {
             .effect = .FlinchChance,
             .bp = 60,
             .type = .Fighting,
-            .pp = 15,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // SandAttack
         .{
             .effect = .AccuracyDown1,
             .bp = 0,
             .type = .Ground,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Headbutt
@@ -548,18 +544,16 @@ pub const Move = enum(u8) {
             .effect = .FlinchChance,
             .bp = 70,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // HornAttack
         .{
             .effect = .None,
             .bp = 65,
             .type = .Normal,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // FuryAttack
@@ -567,8 +561,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 15,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // HornDrill
@@ -576,8 +569,7 @@ pub const Move = enum(u8) {
             .effect = .OHKO,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 30,
+            .accuracy = percent(30),
             .target = .Other,
         },
         // Tackle
@@ -585,8 +577,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 35,
             .type = .Normal,
-            .pp = 35,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
         },
         // BodySlam
@@ -594,27 +585,25 @@ pub const Move = enum(u8) {
             .effect = .ParalyzeChance,
             .bp = 85,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // Wrap
         .{
             .effect = .Binding,
             .bp = 15,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
+            .extra = .{ .protocol = 2 },
         },
         // TakeDown
         .{
             .effect = .Recoil,
             .bp = 90,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // Thrash
@@ -622,17 +611,16 @@ pub const Move = enum(u8) {
             .effect = .Thrashing,
             .bp = 90,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .RandomFoe,
+            .extra = .{ .continuous = true },
         },
         // DoubleEdge
         .{
             .effect = .Recoil,
             .bp = 120,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // TailWhip
@@ -640,8 +628,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // PoisonSting
@@ -649,28 +636,25 @@ pub const Move = enum(u8) {
             .effect = .PoisonChance,
             .bp = 15,
             .type = .Poison,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // Twineedle
         .{
             .effect = .Twineedle,
             .bp = 25,
             .type = .Bug,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 2, // * 10 = 20
+            .chance = percent(20),
         },
         // PinMissile
         .{
             .effect = .MultiHit,
             .bp = 14,
             .type = .Bug,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // Leer
@@ -678,8 +662,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // Bite
@@ -687,18 +670,16 @@ pub const Move = enum(u8) {
             .effect = .FlinchChance,
             .bp = 60,
             .type = .Dark,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // Growl
         .{
             .effect = .AttackDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // Roar
@@ -706,17 +687,16 @@ pub const Move = enum(u8) {
             .effect = .ForceSwitch,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .priority = -1,
         },
         // Sing
         .{
             .effect = .Sleep,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 55,
+            .accuracy = percent(55),
             .target = .Other,
         },
         // Supersonic
@@ -724,8 +704,7 @@ pub const Move = enum(u8) {
             .effect = .Confusion,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 55,
+            .accuracy = percent(55),
             .target = .Other,
         },
         // SonicBoom
@@ -733,8 +712,7 @@ pub const Move = enum(u8) {
             .effect = .FixedDamage,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Disable
@@ -742,8 +720,7 @@ pub const Move = enum(u8) {
             .effect = .Disable,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 55,
+            .accuracy = percent(55),
             .target = .Other,
         },
         // Acid
@@ -751,38 +728,34 @@ pub const Move = enum(u8) {
             .effect = .DefenseDownChance,
             .bp = 40,
             .type = .Poison,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Ember
         .{
             .effect = .BurnChance,
             .bp = 40,
             .type = .Fire,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Flamethrower
         .{
             .effect = .BurnChance,
             .bp = 95,
             .type = .Fire,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Mist
         .{
             .effect = .Mist,
             .bp = 0,
             .type = .Ice,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // WaterGun
@@ -790,8 +763,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 40,
             .type = .Water,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // HydroPump
@@ -799,8 +771,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 120,
             .type = .Water,
-            .pp = 5,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // Surf
@@ -808,8 +779,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 95,
             .type = .Water,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // IceBeam
@@ -817,58 +787,52 @@ pub const Move = enum(u8) {
             .effect = .FreezeChance,
             .bp = 95,
             .type = .Ice,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Blizzard
         .{
             .effect = .FreezeChance,
             .bp = 120,
             .type = .Ice,
-            .pp = 5,
-            .accuracy = 70,
+            .accuracy = percent(70),
             .target = .Foes,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Psybeam
         .{
             .effect = .ConfusionChance,
             .bp = 65,
             .type = .Psychic,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // BubbleBeam
         .{
             .effect = .SpeedDownChance,
             .bp = 65,
             .type = .Water,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // AuroraBeam
         .{
             .effect = .AttackDownChance,
             .bp = 65,
             .type = .Ice,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // HyperBeam
         .{
             .effect = .HyperBeam,
             .bp = 150,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Peck
@@ -876,8 +840,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 35,
             .type = .Flying,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Any,
         },
         // DrillPeck
@@ -885,8 +848,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 80,
             .type = .Flying,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Any,
         },
         // Submission
@@ -894,8 +856,7 @@ pub const Move = enum(u8) {
             .effect = .Recoil,
             .bp = 80,
             .type = .Fighting,
-            .pp = 25,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // LowKick
@@ -903,27 +864,26 @@ pub const Move = enum(u8) {
             .effect = .FlinchChance,
             .bp = 50,
             .type = .Fighting,
-            .pp = 20,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // Counter
         .{
             .effect = .Counter,
             .bp = 0,
             .type = .Fighting,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Depends,
+            .priority = -1,
+            .extra = .{ .metronome = false },
         },
         // SeismicToss
         .{
             .effect = .LevelDamage,
             .bp = 0,
             .type = .Fighting,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Strength
@@ -931,8 +891,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 80,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Absorb
@@ -940,8 +899,7 @@ pub const Move = enum(u8) {
             .effect = .DrainHP,
             .bp = 20,
             .type = .Grass,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // MegaDrain
@@ -949,8 +907,7 @@ pub const Move = enum(u8) {
             .effect = .DrainHP,
             .bp = 40,
             .type = .Grass,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // LeechSeed
@@ -958,8 +915,7 @@ pub const Move = enum(u8) {
             .effect = .LeechSeed,
             .bp = 0,
             .type = .Grass,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Growth
@@ -967,8 +923,7 @@ pub const Move = enum(u8) {
             .effect = .SpAtkUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // RazorLeaf
@@ -976,26 +931,24 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 55,
             .type = .Grass,
-            .pp = 25,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Foes,
         },
         // SolarBeam
         .{
-            .effect = .Solarbeam,
+            .effect = .SolarBeam,
             .bp = 120,
             .type = .Grass,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // PoisonPowder
         .{
             .effect = .Poison,
             .bp = 0,
             .type = .Poison,
-            .pp = 35,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // StunSpore
@@ -1003,8 +956,7 @@ pub const Move = enum(u8) {
             .effect = .Paralyze,
             .bp = 0,
             .type = .Grass,
-            .pp = 30,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // SleepPowder
@@ -1012,8 +964,7 @@ pub const Move = enum(u8) {
             .effect = .Sleep,
             .bp = 0,
             .type = .Grass,
-            .pp = 15,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // PetalDance
@@ -1021,17 +972,16 @@ pub const Move = enum(u8) {
             .effect = .Thrashing,
             .bp = 70,
             .type = .Grass,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .RandomFoe,
+            .extra = .{ .continuous = true },
         },
         // StringShot
         .{
             .effect = .SpeedDown1,
             .bp = 0,
             .type = .Bug,
-            .pp = 40,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Foes,
         },
         // DragonRage
@@ -1039,8 +989,7 @@ pub const Move = enum(u8) {
             .effect = .FixedDamage,
             .bp = 0,
             .type = .Dragon,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // FireSpin
@@ -1048,37 +997,34 @@ pub const Move = enum(u8) {
             .effect = .Binding,
             .bp = 15,
             .type = .Fire,
-            .pp = 15,
-            .accuracy = 70,
+            .accuracy = percent(70),
             .target = .Other,
+            .extra = .{ .protocol = 3 },
         },
         // ThunderShock
         .{
             .effect = .ParalyzeChance,
             .bp = 40,
             .type = .Electric,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Thunderbolt
         .{
             .effect = .ParalyzeChance,
             .bp = 95,
             .type = .Electric,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // ThunderWave
         .{
             .effect = .Paralyze,
             .bp = 0,
             .type = .Electric,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Thunder
@@ -1086,18 +1032,17 @@ pub const Move = enum(u8) {
             .effect = .Thunder,
             .bp = 120,
             .type = .Electric,
-            .pp = 10,
-            .accuracy = 70,
+            .accuracy = percent(70),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
+            .extra = .{ .flying = true },
         },
         // RockThrow
         .{
             .effect = .None,
             .bp = 50,
             .type = .Rock,
-            .pp = 15,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Earthquake
@@ -1105,35 +1050,34 @@ pub const Move = enum(u8) {
             .effect = .Earthquake,
             .bp = 100,
             .type = .Ground,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllOthers,
+            .extra = .{ .underground = true },
         },
         // Fissure
         .{
             .effect = .OHKO,
             .bp = 0,
             .type = .Ground,
-            .pp = 5,
-            .accuracy = 30,
+            .accuracy = percent(30),
             .target = .Other,
+            .extra = .{ .underground = true },
         },
         // Dig
         .{
-            .effect = .Fly,
+            .effect = .FlyDig,
             .bp = 60,
             .type = .Ground,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .extra = .{ .sleep_talk = false },
         },
         // Toxic
         .{
             .effect = .Toxic,
             .bp = 0,
             .type = .Poison,
-            .pp = 10,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // Confusion
@@ -1141,28 +1085,25 @@ pub const Move = enum(u8) {
             .effect = .ConfusionChance,
             .bp = 50,
             .type = .Psychic,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Psychic
         .{
             .effect = .SpDefDownChance,
             .bp = 90,
             .type = .Psychic,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Hypnosis
         .{
             .effect = .Sleep,
             .bp = 0,
             .type = .Psychic,
-            .pp = 20,
-            .accuracy = 60,
+            .accuracy = percent(60),
             .target = .Other,
         },
         // Meditate
@@ -1170,8 +1111,7 @@ pub const Move = enum(u8) {
             .effect = .AttackUp1,
             .bp = 0,
             .type = .Psychic,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Agility
@@ -1179,8 +1119,7 @@ pub const Move = enum(u8) {
             .effect = .SpeedUp2,
             .bp = 0,
             .type = .Psychic,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // QuickAttack
@@ -1188,17 +1127,16 @@ pub const Move = enum(u8) {
             .effect = .Priority,
             .bp = 40,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .priority = 1,
         },
         // Rage
         .{
             .effect = .Rage,
             .bp = 20,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Teleport
@@ -1206,8 +1144,7 @@ pub const Move = enum(u8) {
             .effect = .Teleport,
             .bp = 0,
             .type = .Psychic,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // NightShade
@@ -1215,8 +1152,7 @@ pub const Move = enum(u8) {
             .effect = .LevelDamage,
             .bp = 0,
             .type = .Ghost,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Mimic
@@ -1224,17 +1160,16 @@ pub const Move = enum(u8) {
             .effect = .Mimic,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .extra = .{ .metronome = false },
         },
         // Screech
         .{
             .effect = .DefenseDown2,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // DoubleTeam
@@ -1242,8 +1177,7 @@ pub const Move = enum(u8) {
             .effect = .EvasionUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Recover
@@ -1251,8 +1185,7 @@ pub const Move = enum(u8) {
             .effect = .Heal,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Harden
@@ -1260,8 +1193,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Minimize
@@ -1269,8 +1201,7 @@ pub const Move = enum(u8) {
             .effect = .EvasionUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Smokescreen
@@ -1278,8 +1209,7 @@ pub const Move = enum(u8) {
             .effect = .AccuracyDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // ConfuseRay
@@ -1287,8 +1217,7 @@ pub const Move = enum(u8) {
             .effect = .Confusion,
             .bp = 0,
             .type = .Ghost,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Withdraw
@@ -1296,8 +1225,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseUp1,
             .bp = 0,
             .type = .Water,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // DefenseCurl
@@ -1305,8 +1233,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseCurl,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Barrier
@@ -1314,8 +1241,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseUp2,
             .bp = 0,
             .type = .Psychic,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // LightScreen
@@ -1323,8 +1249,7 @@ pub const Move = enum(u8) {
             .effect = .LightScreen,
             .bp = 0,
             .type = .Psychic,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllySide,
         },
         // Haze
@@ -1332,8 +1257,7 @@ pub const Move = enum(u8) {
             .effect = .Haze,
             .bp = 0,
             .type = .Ice,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .All,
         },
         // Reflect
@@ -1341,8 +1265,7 @@ pub const Move = enum(u8) {
             .effect = .Reflect,
             .bp = 0,
             .type = .Psychic,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllySide,
         },
         // FocusEnergy
@@ -1350,8 +1273,7 @@ pub const Move = enum(u8) {
             .effect = .FocusEnergy,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Bide
@@ -1359,26 +1281,25 @@ pub const Move = enum(u8) {
             .effect = .Bide,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Metronome
         .{
             .effect = .Metronome,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
+            .extra = .{ .metronome = false },
         },
         // MirrorMove
         .{
             .effect = .MirrorMove,
             .bp = 0,
             .type = .Flying,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // SelfDestruct
@@ -1386,8 +1307,7 @@ pub const Move = enum(u8) {
             .effect = .Explode,
             .bp = 200,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllOthers,
         },
         // EggBomb
@@ -1395,8 +1315,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 100,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // Lick
@@ -1404,58 +1323,52 @@ pub const Move = enum(u8) {
             .effect = .ParalyzeChance,
             .bp = 20,
             .type = .Ghost,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // Smog
         .{
             .effect = .PoisonChance,
             .bp = 20,
             .type = .Poison,
-            .pp = 20,
-            .accuracy = 70,
+            .accuracy = percent(70),
             .target = .Other,
-            .chance = 4, // * 10 = 40
+            .chance = percent(40),
         },
         // Sludge
         .{
             .effect = .PoisonChance,
             .bp = 65,
             .type = .Poison,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // BoneClub
         .{
             .effect = .FlinchChance,
             .bp = 65,
             .type = .Ground,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // FireBlast
         .{
             .effect = .BurnChance,
             .bp = 120,
             .type = .Fire,
-            .pp = 5,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Waterfall
         .{
             .effect = .None,
             .bp = 80,
             .type = .Water,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Clamp
@@ -1463,17 +1376,16 @@ pub const Move = enum(u8) {
             .effect = .Binding,
             .bp = 35,
             .type = .Water,
-            .pp = 10,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
+            .extra = .{ .protocol = 4 },
         },
         // Swift
         .{
             .effect = .AlwaysHit,
             .bp = 60,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // SkullBash
@@ -1481,17 +1393,16 @@ pub const Move = enum(u8) {
             .effect = .SkullBash,
             .bp = 100,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // SpikeCannon
         .{
             .effect = .MultiHit,
             .bp = 20,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Constrict
@@ -1499,18 +1410,16 @@ pub const Move = enum(u8) {
             .effect = .SpeedDownChance,
             .bp = 10,
             .type = .Normal,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Amnesia
         .{
             .effect = .SpDefUp2,
             .bp = 0,
             .type = .Psychic,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Kinesis
@@ -1518,8 +1427,7 @@ pub const Move = enum(u8) {
             .effect = .AccuracyDown1,
             .bp = 0,
             .type = .Psychic,
-            .pp = 15,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // SoftBoiled
@@ -1527,8 +1435,7 @@ pub const Move = enum(u8) {
             .effect = .Heal,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // HighJumpKick
@@ -1536,8 +1443,7 @@ pub const Move = enum(u8) {
             .effect = .JumpKick,
             .bp = 85,
             .type = .Fighting,
-            .pp = 20,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Glare
@@ -1545,8 +1451,7 @@ pub const Move = enum(u8) {
             .effect = .Paralyze,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // DreamEater
@@ -1554,8 +1459,7 @@ pub const Move = enum(u8) {
             .effect = .DreamEater,
             .bp = 100,
             .type = .Psychic,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // PoisonGas
@@ -1563,8 +1467,7 @@ pub const Move = enum(u8) {
             .effect = .Poison,
             .bp = 0,
             .type = .Poison,
-            .pp = 40,
-            .accuracy = 55,
+            .accuracy = percent(55),
             .target = .Other,
         },
         // Barrage
@@ -1572,8 +1475,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 15,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // LeechLife
@@ -1581,8 +1483,7 @@ pub const Move = enum(u8) {
             .effect = .DrainHP,
             .bp = 20,
             .type = .Bug,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // LovelyKiss
@@ -1590,8 +1491,7 @@ pub const Move = enum(u8) {
             .effect = .Sleep,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // SkyAttack
@@ -1599,17 +1499,16 @@ pub const Move = enum(u8) {
             .effect = .SkyAttack,
             .bp = 140,
             .type = .Flying,
-            .pp = 5,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Any,
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Transform
         .{
             .effect = .Transform,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Bubble
@@ -1617,28 +1516,25 @@ pub const Move = enum(u8) {
             .effect = .SpeedDownChance,
             .bp = 20,
             .type = .Water,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // DizzyPunch
         .{
             .effect = .ConfusionChance,
             .bp = 70,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 2, // * 10 = 20
+            .chance = percent(20),
         },
         // Spore
         .{
             .effect = .Sleep,
             .bp = 0,
             .type = .Grass,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Flash
@@ -1646,8 +1542,7 @@ pub const Move = enum(u8) {
             .effect = .AccuracyDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 70,
+            .accuracy = percent(70),
             .target = .Other,
         },
         // Psywave
@@ -1655,8 +1550,7 @@ pub const Move = enum(u8) {
             .effect = .Psywave,
             .bp = 0,
             .type = .Psychic,
-            .pp = 15,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // Splash
@@ -1664,8 +1558,7 @@ pub const Move = enum(u8) {
             .effect = .Splash,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // AcidArmor
@@ -1673,8 +1566,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseUp2,
             .bp = 0,
             .type = .Poison,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Crabhammer
@@ -1682,8 +1574,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 90,
             .type = .Water,
-            .pp = 10,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // Explosion
@@ -1691,8 +1582,7 @@ pub const Move = enum(u8) {
             .effect = .Explode,
             .bp = 250,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllOthers,
         },
         // FurySwipes
@@ -1700,8 +1590,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 18,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // Bonemerang
@@ -1709,8 +1598,7 @@ pub const Move = enum(u8) {
             .effect = .DoubleHit,
             .bp = 50,
             .type = .Ground,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Rest
@@ -1718,8 +1606,7 @@ pub const Move = enum(u8) {
             .effect = .Heal,
             .bp = 0,
             .type = .Psychic,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // RockSlide
@@ -1727,28 +1614,25 @@ pub const Move = enum(u8) {
             .effect = .FlinchChance,
             .bp = 75,
             .type = .Rock,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Foes,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // HyperFang
         .{
             .effect = .FlinchChance,
             .bp = 80,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Sharpen
         .{
             .effect = .AttackUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Conversion
@@ -1756,8 +1640,7 @@ pub const Move = enum(u8) {
             .effect = .Conversion,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // TriAttack
@@ -1765,18 +1648,16 @@ pub const Move = enum(u8) {
             .effect = .TriAttack,
             .bp = 80,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 2, // * 10 = 20
+            .chance = percent(20),
         },
         // SuperFang
         .{
             .effect = .SuperFang,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Slash
@@ -1784,8 +1665,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 70,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Substitute
@@ -1793,8 +1673,7 @@ pub const Move = enum(u8) {
             .effect = .Substitute,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Struggle
@@ -1802,26 +1681,25 @@ pub const Move = enum(u8) {
             .effect = .Recoil,
             .bp = 50,
             .type = .Normal,
-            .pp = 1,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .RandomFoe,
+            .extra = .{ .metronome = false },
         },
         // Sketch
         .{
             .effect = .Sketch,
             .bp = 0,
             .type = .Normal,
-            .pp = 1,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .extra = .{ .metronome = false },
         },
         // TripleKick
         .{
             .effect = .TripleKick,
             .bp = 10,
             .type = .Fighting,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Thief
@@ -1829,18 +1707,17 @@ pub const Move = enum(u8) {
             .effect = .Thief,
             .bp = 40,
             .type = .Dark,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 10, // * 10 = 100
+            .chance = percent(100),
+            .extra = .{ .metronome = false },
         },
         // SpiderWeb
         .{
             .effect = .MeanLook,
             .bp = 0,
             .type = .Bug,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // MindReader
@@ -1848,8 +1725,7 @@ pub const Move = enum(u8) {
             .effect = .LockOn,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Nightmare
@@ -1857,8 +1733,7 @@ pub const Move = enum(u8) {
             .effect = .Nightmare,
             .bp = 0,
             .type = .Ghost,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // FlameWheel
@@ -1866,28 +1741,25 @@ pub const Move = enum(u8) {
             .effect = .FlameWheel,
             .bp = 60,
             .type = .Fire,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Snore
         .{
             .effect = .Snore,
             .bp = 40,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // Curse
         .{
             .effect = .Curse,
             .bp = 0,
             .type = .@"???",
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Flail
@@ -1895,8 +1767,7 @@ pub const Move = enum(u8) {
             .effect = .Reversal,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Conversion2
@@ -1904,8 +1775,7 @@ pub const Move = enum(u8) {
             .effect = .Conversion2,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Aeroblast
@@ -1913,8 +1783,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 100,
             .type = .Flying,
-            .pp = 5,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Any,
         },
         // CottonSpore
@@ -1922,8 +1791,7 @@ pub const Move = enum(u8) {
             .effect = .SpeedDown2,
             .bp = 0,
             .type = .Grass,
-            .pp = 40,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // Reversal
@@ -1931,8 +1799,7 @@ pub const Move = enum(u8) {
             .effect = .Reversal,
             .bp = 0,
             .type = .Fighting,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Spite
@@ -1940,8 +1807,7 @@ pub const Move = enum(u8) {
             .effect = .Spite,
             .bp = 0,
             .type = .Ghost,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // PowderSnow
@@ -1949,36 +1815,35 @@ pub const Move = enum(u8) {
             .effect = .FreezeChance,
             .bp = 40,
             .type = .Ice,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // Protect
         .{
             .effect = .Protect,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
+            .priority = 2,
+            .extra = .{ .metronome = false },
         },
         // MachPunch
         .{
             .effect = .Priority,
             .bp = 40,
             .type = .Fighting,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .priority = 1,
         },
         // ScaryFace
         .{
             .effect = .SpeedDown2,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // FeintAttack
@@ -1986,8 +1851,7 @@ pub const Move = enum(u8) {
             .effect = .AlwaysHit,
             .bp = 60,
             .type = .Dark,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // SweetKiss
@@ -1995,8 +1859,7 @@ pub const Move = enum(u8) {
             .effect = .Confusion,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // BellyDrum
@@ -2004,8 +1867,7 @@ pub const Move = enum(u8) {
             .effect = .BellyDrum,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // SludgeBomb
@@ -2013,38 +1875,34 @@ pub const Move = enum(u8) {
             .effect = .PoisonChance,
             .bp = 90,
             .type = .Poison,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // MudSlap
         .{
             .effect = .AccuracyDownChance,
             .bp = 20,
             .type = .Ground,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 10, // * 10 = 100
+            .chance = percent(100),
         },
         // Octazooka
         .{
             .effect = .AccuracyDownChance,
             .bp = 65,
             .type = .Water,
-            .pp = 10,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
-            .chance = 5, // * 10 = 50
+            .chance = percent(50),
         },
         // Spikes
         .{
             .effect = .Spikes,
             .bp = 0,
             .type = .Ground,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .FoeSide,
         },
         // ZapCannon
@@ -2052,18 +1910,16 @@ pub const Move = enum(u8) {
             .effect = .ParalyzeChance,
             .bp = 100,
             .type = .Electric,
-            .pp = 5,
-            .accuracy = 50,
+            .accuracy = percent(50),
             .target = .Other,
-            .chance = 10, // * 10 = 100
+            .chance = percent(100),
         },
         // Foresight
         .{
             .effect = .Foresight,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // DestinyBond
@@ -2071,17 +1927,16 @@ pub const Move = enum(u8) {
             .effect = .DestinyBond,
             .bp = 0,
             .type = .Ghost,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
+            .extra = .{ .metronome = false },
         },
         // PerishSong
         .{
             .effect = .PerishSong,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .All,
         },
         // IcyWind
@@ -2089,27 +1944,26 @@ pub const Move = enum(u8) {
             .effect = .SpeedDownChance,
             .bp = 55,
             .type = .Ice,
-            .pp = 15,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Foes,
-            .chance = 10, // * 10 = 100
+            .chance = percent(100),
         },
         // Detect
         .{
             .effect = .Protect,
             .bp = 0,
             .type = .Fighting,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
+            .priority = 2,
+            .extra = .{ .metronome = false },
         },
         // BoneRush
         .{
             .effect = .MultiHit,
             .bp = 25,
             .type = .Ground,
-            .pp = 10,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // LockOn
@@ -2117,8 +1971,7 @@ pub const Move = enum(u8) {
             .effect = .LockOn,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Outrage
@@ -2126,17 +1979,16 @@ pub const Move = enum(u8) {
             .effect = .Thrashing,
             .bp = 90,
             .type = .Dragon,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .RandomFoe,
+            .extra = .{ .continuous = true },
         },
         // Sandstorm
         .{
             .effect = .Sandstorm,
             .bp = 0,
             .type = .Rock,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .All,
         },
         // GigaDrain
@@ -2144,8 +1996,7 @@ pub const Move = enum(u8) {
             .effect = .DrainHP,
             .bp = 60,
             .type = .Grass,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Endure
@@ -2153,17 +2004,17 @@ pub const Move = enum(u8) {
             .effect = .Endure,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
+            .priority = 2,
+            .extra = .{ .metronome = false },
         },
         // Charm
         .{
             .effect = .AttackDown2,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Rollout
@@ -2171,17 +2022,16 @@ pub const Move = enum(u8) {
             .effect = .Rollout,
             .bp = 30,
             .type = .Rock,
-            .pp = 20,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
+            .extra = .{ .continuous = true },
         },
         // FalseSwipe
         .{
             .effect = .FalseSwipe,
             .bp = 40,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Swagger
@@ -2189,8 +2039,7 @@ pub const Move = enum(u8) {
             .effect = .Swagger,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // MilkDrink
@@ -2198,8 +2047,7 @@ pub const Move = enum(u8) {
             .effect = .Heal,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Spark
@@ -2207,18 +2055,16 @@ pub const Move = enum(u8) {
             .effect = .ParalyzeChance,
             .bp = 65,
             .type = .Electric,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // FuryCutter
         .{
             .effect = .FuryCutter,
             .bp = 10,
             .type = .Bug,
-            .pp = 20,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
         },
         // SteelWing
@@ -2226,18 +2072,16 @@ pub const Move = enum(u8) {
             .effect = .DefenseUpChance,
             .bp = 70,
             .type = .Steel,
-            .pp = 25,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // MeanLook
         .{
             .effect = .MeanLook,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Attract
@@ -2245,8 +2089,7 @@ pub const Move = enum(u8) {
             .effect = .Attract,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // SleepTalk
@@ -2254,17 +2097,16 @@ pub const Move = enum(u8) {
             .effect = .SleepTalk,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
+            .extra = .{ .metronome = false },
         },
         // HealBell
         .{
             .effect = .HealBell,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Return
@@ -2272,8 +2114,7 @@ pub const Move = enum(u8) {
             .effect = .Return,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Present
@@ -2281,8 +2122,7 @@ pub const Move = enum(u8) {
             .effect = .Present,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Frustration
@@ -2290,8 +2130,7 @@ pub const Move = enum(u8) {
             .effect = .Frustration,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Safeguard
@@ -2299,8 +2138,7 @@ pub const Move = enum(u8) {
             .effect = .Safeguard,
             .bp = 0,
             .type = .Normal,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllySide,
         },
         // PainSplit
@@ -2308,8 +2146,7 @@ pub const Move = enum(u8) {
             .effect = .PainSplit,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // SacredFire
@@ -2317,37 +2154,34 @@ pub const Move = enum(u8) {
             .effect = .SacredFire,
             .bp = 100,
             .type = .Fire,
-            .pp = 5,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
-            .chance = 5, // * 10 = 50
+            .chance = percent(50),
         },
         // Magnitude
         .{
             .effect = .Magnitude,
             .bp = 0,
             .type = .Ground,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllOthers,
+            .extra = .{ .underground = true },
         },
         // DynamicPunch
         .{
             .effect = .ConfusionChance,
             .bp = 100,
             .type = .Fighting,
-            .pp = 5,
-            .accuracy = 50,
+            .accuracy = percent(50),
             .target = .Other,
-            .chance = 10, // * 10 = 100
+            .chance = percent(100),
         },
         // Megahorn
         .{
             .effect = .None,
             .bp = 120,
             .type = .Bug,
-            .pp = 10,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // DragonBreath
@@ -2355,18 +2189,16 @@ pub const Move = enum(u8) {
             .effect = .ParalyzeChance,
             .bp = 60,
             .type = .Dragon,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // BatonPass
         .{
             .effect = .BatonPass,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Encore
@@ -2374,8 +2206,7 @@ pub const Move = enum(u8) {
             .effect = .Encore,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Pursuit
@@ -2383,8 +2214,7 @@ pub const Move = enum(u8) {
             .effect = .Pursuit,
             .bp = 40,
             .type = .Dark,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // RapidSpin
@@ -2392,8 +2222,7 @@ pub const Move = enum(u8) {
             .effect = .RapidSpin,
             .bp = 20,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // SweetScent
@@ -2401,8 +2230,7 @@ pub const Move = enum(u8) {
             .effect = .EvasionDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // IronTail
@@ -2410,37 +2238,34 @@ pub const Move = enum(u8) {
             .effect = .DefenseDownChance,
             .bp = 100,
             .type = .Steel,
-            .pp = 15,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
-            .chance = 3, // * 10 = 30
+            .chance = percent(30),
         },
         // MetalClaw
         .{
             .effect = .AttackUpChance,
             .bp = 50,
             .type = .Steel,
-            .pp = 35,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // VitalThrow
         .{
             .effect = .AlwaysHit,
             .bp = 70,
             .type = .Fighting,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .priority = -1,
         },
         // MorningSun
         .{
             .effect = .MorningSun,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Synthesis
@@ -2448,8 +2273,7 @@ pub const Move = enum(u8) {
             .effect = .Synthesis,
             .bp = 0,
             .type = .Grass,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Moonlight
@@ -2457,8 +2281,7 @@ pub const Move = enum(u8) {
             .effect = .Moonlight,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // HiddenPower
@@ -2466,8 +2289,7 @@ pub const Move = enum(u8) {
             .effect = .HiddenPower,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // CrossChop
@@ -2475,8 +2297,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 100,
             .type = .Fighting,
-            .pp = 5,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // Twister
@@ -2484,18 +2305,17 @@ pub const Move = enum(u8) {
             .effect = .Twister,
             .bp = 40,
             .type = .Dragon,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
-            .chance = 2, // * 10 = 20
+            .chance = percent(20),
+            .extra = .{ .flying = true },
         },
         // RainDance
         .{
             .effect = .RainDance,
             .bp = 0,
             .type = .Water,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .All,
         },
         // SunnyDay
@@ -2503,8 +2323,7 @@ pub const Move = enum(u8) {
             .effect = .SunnyDay,
             .bp = 0,
             .type = .Fire,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .All,
         },
         // Crunch
@@ -2512,27 +2331,26 @@ pub const Move = enum(u8) {
             .effect = .SpDefDownChance,
             .bp = 80,
             .type = .Dark,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 2, // * 10 = 20
+            .chance = percent(20),
         },
         // MirrorCoat
         .{
             .effect = .MirrorCoat,
             .bp = 0,
             .type = .Psychic,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Depends,
+            .priority = -1,
+            .extra = .{ .metronome = false },
         },
         // PsychUp
         .{
             .effect = .PsychUp,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // ExtremeSpeed
@@ -2540,37 +2358,34 @@ pub const Move = enum(u8) {
             .effect = .Priority,
             .bp = 80,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
+            .priority = 1,
         },
         // AncientPower
         .{
             .effect = .AllStatUpChance,
             .bp = 60,
             .type = .Rock,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 1, // * 10 = 10
+            .chance = percent(10),
         },
         // ShadowBall
         .{
             .effect = .SpDefDownChance,
             .bp = 80,
             .type = .Ghost,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 2, // * 10 = 20
+            .chance = percent(20),
         },
         // FutureSight
         .{
             .effect = .FutureSight,
             .bp = 80,
             .type = .Psychic,
-            .pp = 15,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // RockSmash
@@ -2578,27 +2393,25 @@ pub const Move = enum(u8) {
             .effect = .DefenseDownChance,
             .bp = 20,
             .type = .Fighting,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
-            .chance = 5, // * 10 = 50
+            .chance = percent(50),
         },
         // Whirlpool
         .{
             .effect = .Binding,
             .bp = 15,
             .type = .Water,
-            .pp = 15,
-            .accuracy = 70,
+            .accuracy = percent(70),
             .target = .Other,
+            .extra = .{ .protocol = 5 },
         },
         // BeatUp
         .{
             .effect = .BeatUp,
             .bp = 10,
             .type = .Dark,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
     };
@@ -2651,7 +2464,7 @@ pub const Move = enum(u8) {
         FixedDamage,
         FlameWheel,
         FlinchChance,
-        Fly,
+        FlyDig,
         FocusEnergy,
         ForceSwitch,
         Foresight,
@@ -2714,7 +2527,7 @@ pub const Move = enum(u8) {
         Sleep,
         SleepTalk,
         Snore,
-        Solarbeam,
+        SolarBeam,
         SpAtkUp1,
         SpDefDownChance,
         SpDefUp2,
@@ -2745,6 +2558,11 @@ pub const Move = enum(u8) {
         comptime {
             assert(@sizeOf(Effect) == 1);
         }
+        /// Whether this effect has a high critical rate.
+        pub fn isHighCritical(effect: Effect) bool {
+            return effect == .HighCritical or effect == .RazorWind;
+        }
     };
     const Target = enum(u8) {
@@ -2768,17 +2586,291 @@ pub const Move = enum(u8) {
         RandomFoe,
     };
+    const PP = [_]u8{
+        35, // Pound
+        25, // KarateChop
+        10, // DoubleSlap
+        15, // CometPunch
+        20, // MegaPunch
+        20, // PayDay
+        15, // FirePunch
+        15, // IcePunch
+        15, // ThunderPunch
+        35, // Scratch
+        30, // ViseGrip
+        5, // Guillotine
+        10, // RazorWind
+        30, // SwordsDance
+        30, // Cut
+        35, // Gust
+        35, // WingAttack
+        20, // Whirlwind
+        15, // Fly
+        20, // Bind
+        20, // Slam
+        10, // VineWhip
+        20, // Stomp
+        30, // DoubleKick
+        5, // MegaKick
+        25, // JumpKick
+        15, // RollingKick
+        15, // SandAttack
+        15, // Headbutt
+        25, // HornAttack
+        20, // FuryAttack
+        5, // HornDrill
+        35, // Tackle
+        15, // BodySlam
+        20, // Wrap
+        20, // TakeDown
+        20, // Thrash
+        15, // DoubleEdge
+        30, // TailWhip
+        35, // PoisonSting
+        20, // Twineedle
+        20, // PinMissile
+        30, // Leer
+        25, // Bite
+        40, // Growl
+        20, // Roar
+        15, // Sing
+        20, // Supersonic
+        20, // SonicBoom
+        20, // Disable
+        30, // Acid
+        25, // Ember
+        15, // Flamethrower
+        30, // Mist
+        25, // WaterGun
+        5, // HydroPump
+        15, // Surf
+        10, // IceBeam
+        5, // Blizzard
+        20, // Psybeam
+        20, // BubbleBeam
+        20, // AuroraBeam
+        5, // HyperBeam
+        35, // Peck
+        20, // DrillPeck
+        25, // Submission
+        20, // LowKick
+        20, // Counter
+        20, // SeismicToss
+        15, // Strength
+        20, // Absorb
+        10, // MegaDrain
+        10, // LeechSeed
+        40, // Growth
+        25, // RazorLeaf
+        10, // SolarBeam
+        35, // PoisonPowder
+        30, // StunSpore
+        15, // SleepPowder
+        20, // PetalDance
+        40, // StringShot
+        10, // DragonRage
+        15, // FireSpin
+        30, // ThunderShock
+        15, // Thunderbolt
+        20, // ThunderWave
+        10, // Thunder
+        15, // RockThrow
+        10, // Earthquake
+        5, // Fissure
+        10, // Dig
+        10, // Toxic
+        25, // Confusion
+        10, // Psychic
+        20, // Hypnosis
+        40, // Meditate
+        30, // Agility
+        30, // QuickAttack
+        20, // Rage
+        20, // Teleport
+        15, // NightShade
+        10, // Mimic
+        40, // Screech
+        15, // DoubleTeam
+        20, // Recover
+        30, // Harden
+        20, // Minimize
+        20, // Smokescreen
+        10, // ConfuseRay
+        40, // Withdraw
+        40, // DefenseCurl
+        30, // Barrier
+        30, // LightScreen
+        30, // Haze
+        20, // Reflect
+        30, // FocusEnergy
+        10, // Bide
+        10, // Metronome
+        20, // MirrorMove
+        5, // SelfDestruct
+        10, // EggBomb
+        30, // Lick
+        20, // Smog
+        20, // Sludge
+        20, // BoneClub
+        5, // FireBlast
+        15, // Waterfall
+        10, // Clamp
+        20, // Swift
+        15, // SkullBash
+        15, // SpikeCannon
+        35, // Constrict
+        20, // Amnesia
+        15, // Kinesis
+        10, // SoftBoiled
+        20, // HighJumpKick
+        30, // Glare
+        15, // DreamEater
+        40, // PoisonGas
+        20, // Barrage
+        15, // LeechLife
+        10, // LovelyKiss
+        5, // SkyAttack
+        10, // Transform
+        30, // Bubble
+        10, // DizzyPunch
+        15, // Spore
+        20, // Flash
+        15, // Psywave
+        40, // Splash
+        40, // AcidArmor
+        10, // Crabhammer
+        5, // Explosion
+        15, // FurySwipes
+        10, // Bonemerang
+        10, // Rest
+        10, // RockSlide
+        15, // HyperFang
+        30, // Sharpen
+        30, // Conversion
+        10, // TriAttack
+        10, // SuperFang
+        20, // Slash
+        10, // Substitute
+        1, // Struggle
+        1, // Sketch
+        10, // TripleKick
+        10, // Thief
+        10, // SpiderWeb
+        5, // MindReader
+        15, // Nightmare
+        25, // FlameWheel
+        15, // Snore
+        10, // Curse
+        15, // Flail
+        30, // Conversion2
+        5, // Aeroblast
+        40, // CottonSpore
+        15, // Reversal
+        10, // Spite
+        25, // PowderSnow
+        10, // Protect
+        30, // MachPunch
+        10, // ScaryFace
+        20, // FeintAttack
+        10, // SweetKiss
+        10, // BellyDrum
+        10, // SludgeBomb
+        10, // MudSlap
+        10, // Octazooka
+        20, // Spikes
+        5, // ZapCannon
+        40, // Foresight
+        5, // DestinyBond
+        5, // PerishSong
+        15, // IcyWind
+        5, // Detect
+        10, // BoneRush
+        5, // LockOn
+        15, // Outrage
+        10, // Sandstorm
+        5, // GigaDrain
+        10, // Endure
+        20, // Charm
+        20, // Rollout
+        40, // FalseSwipe
+        15, // Swagger
+        10, // MilkDrink
+        20, // Spark
+        20, // FuryCutter
+        25, // SteelWing
+        5, // MeanLook
+        15, // Attract
+        10, // SleepTalk
+        5, // HealBell
+        20, // Return
+        15, // Present
+        20, // Frustration
+        25, // Safeguard
+        20, // PainSplit
+        5, // SacredFire
+        30, // Magnitude
+        5, // DynamicPunch
+        10, // Megahorn
+        20, // DragonBreath
+        40, // BatonPass
+        5, // Encore
+        20, // Pursuit
+        40, // RapidSpin
+        20, // SweetScent
+        15, // IronTail
+        35, // MetalClaw
+        10, // VitalThrow
+        5, // MorningSun
+        5, // Synthesis
+        5, // Moonlight
+        15, // HiddenPower
+        5, // CrossChop
+        20, // Twister
+        5, // RainDance
+        5, // SunnyDay
+        15, // Crunch
+        20, // MirrorCoat
+        10, // PsychUp
+        5, // ExtremeSpeed
+        5, // AncientPower
+        15, // ShadowBall
+        15, // FutureSight
+        15, // RockSmash
+        15, // Whirlpool
+        10, // BeatUp,
+    };
     comptime {
         assert(@sizeOf(Move) == 1);
-        assert(@sizeOf(@TypeOf(DATA)) == 1757);
+        assert(@sizeOf(@TypeOf(DATA)) == 2008);
     }
     /// The number of Pokémon moves in this generation.
     pub const size = 251;
+    /// Pokémon moves that can be called by Metronome in this generation.
+    pub const METRONOME = init: {
+        var num = 0;
+        var moves: [239]Move = undefined;
+        for (1..Move.size + 1) |i| {
+            if (Move.get(@enumFromInt(i)).extra.metronome) {
+                moves[num] = @enumFromInt(i);
+                num += 1;
+            }
+        }
+        assert(num == moves.len);
+        break :init moves;
+    };
     /// Returns the `Data` corresponding to the move.
-    pub inline fn get(id: Move) Data {
+    pub fn get(id: Move) Data {
         assert(id != .None);
         return DATA[@intFromEnum(id) - 1];
     }
+    /// Returns the base PP of the move.
+    pub fn pp(id: Move) u8 {
+        assert(id != .None);
+        return PP[@intFromEnum(id) - 1];
+    }
 };