npm - @pkmn/engine - Versions diffs - 0.1.0-dev.d3e796d5 → 0.1.0-dev.d56bdadd - Mend

@pkmn/engine 0.1.0-dev.d3e796d5 → 0.1.0-dev.d56bdadd

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 (36) hide show

package/build/pkg/data/ids.json +12 -12
package/build/pkg/data/layout.json +2 -2
package/build/pkg/data/protocol.json +69 -12
package/build/pkg/data.d.ts +2 -2
package/build/pkg/gen1.js +2 -2
package/build/pkg/gen1.js.map +1 -1
package/build/pkg/protocol.js +56 -37
package/build/pkg/protocol.js.map +1 -1
package/build.zig +21 -15
package/package.json +26 -14
package/src/lib/binding/node.zig +1 -1
package/src/lib/common/data.zig +8 -20
package/src/lib/common/optional.zig +8 -1
package/src/lib/common/protocol.zig +500 -56
package/src/lib/common/rational.zig +5 -5
package/src/lib/common/rng.zig +15 -6
package/src/lib/gen1/README.md +31 -29
package/src/lib/gen1/calc.zig +4 -4
package/src/lib/gen1/chance.zig +55 -39
package/src/lib/gen1/data/moves.zig +192 -180
package/src/lib/gen1/data/species.zig +2 -2
package/src/lib/gen1/data/types.zig +7 -7
package/src/lib/gen1/data.zig +31 -43
package/src/lib/gen1/helpers.zig +26 -41
package/src/lib/gen1/mechanics.zig +131 -169
package/src/lib/gen2/README.md +18 -72
package/src/lib/gen2/calc.zig +143 -0
package/src/lib/gen2/chance.zig +1314 -0
package/src/lib/gen2/data/items.zig +12 -18
package/src/lib/gen2/data/moves.zig +649 -568
package/src/lib/gen2/data/species.zig +1 -1
package/src/lib/gen2/data/types.zig +134 -31
package/src/lib/gen2/data.zig +70 -67
package/src/lib/gen2/generated.zig +808 -0
package/src/lib/gen2/helpers.zig +4 -9
package/src/lib/gen2/mechanics.zig +3113 -100

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

@@ -1,11 +1,13 @@
-//! Code generated by `tools/generate` - manual edits will be overwritten
+//! Code generated by `tools/generate` - manual edits will be overwritten.
 const std = @import("std");
+const rng = @import("../../common/rng.zig");
 const gen2 = @import("../../gen2/data.zig");
 const assert = std.debug.assert;
+const percent = rng.Gen12.percent;
 const Type = gen2.Type;
 /// Representation of a Generation II Pokémon move.
@@ -271,16 +273,32 @@ 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
+        /// 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) == 8);
@@ -293,8 +311,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 40,
             .type = .Normal,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // KarateChop
@@ -302,8 +319,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 50,
             .type = .Fighting,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // DoubleSlap
@@ -311,8 +327,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 15,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // CometPunch
@@ -320,8 +335,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 18,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // MegaPunch
@@ -329,8 +343,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 80,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // PayDay
@@ -338,8 +351,7 @@ pub const Move = enum(u8) {
             .effect = .PayDay,
             .bp = 40,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // FirePunch
@@ -347,38 +359,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
@@ -386,8 +394,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 55,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Guillotine
@@ -395,8 +402,7 @@ pub const Move = enum(u8) {
             .effect = .OHKO,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 30,
+            .accuracy = percent(30),
             .target = .Other,
         },
         // RazorWind
@@ -404,17 +410,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
@@ -422,8 +427,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 50,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
         },
         // Gust
@@ -431,17 +435,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
@@ -449,36 +452,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
@@ -486,8 +488,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 35,
             .type = .Grass,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Stomp
@@ -495,18 +496,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
@@ -514,8 +513,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 120,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // JumpKick
@@ -523,8 +521,7 @@ pub const Move = enum(u8) {
             .effect = .JumpKick,
             .bp = 70,
             .type = .Fighting,
-            .pp = 25,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
         },
         // RollingKick
@@ -532,18 +529,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
@@ -551,18 +546,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
@@ -570,8 +563,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 15,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // HornDrill
@@ -579,8 +571,7 @@ pub const Move = enum(u8) {
             .effect = .OHKO,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 30,
+            .accuracy = percent(30),
             .target = .Other,
         },
         // Tackle
@@ -588,8 +579,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 35,
             .type = .Normal,
-            .pp = 35,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Other,
         },
         // BodySlam
@@ -597,27 +587,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
@@ -625,17 +613,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
@@ -643,8 +630,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // PoisonSting
@@ -652,28 +638,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
@@ -681,8 +664,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // Bite
@@ -690,18 +672,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
@@ -709,8 +689,7 @@ pub const Move = enum(u8) {
             .effect = .ForceSwitch,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
             .priority = -1,
         },
@@ -719,8 +698,7 @@ pub const Move = enum(u8) {
             .effect = .Sleep,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 55,
+            .accuracy = percent(55),
             .target = .Other,
         },
         // Supersonic
@@ -728,8 +706,7 @@ pub const Move = enum(u8) {
             .effect = .Confusion,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 55,
+            .accuracy = percent(55),
             .target = .Other,
         },
         // SonicBoom
@@ -737,8 +714,7 @@ pub const Move = enum(u8) {
             .effect = .FixedDamage,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Disable
@@ -746,8 +722,7 @@ pub const Move = enum(u8) {
             .effect = .Disable,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 55,
+            .accuracy = percent(55),
             .target = .Other,
         },
         // Acid
@@ -755,38 +730,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
@@ -794,8 +765,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 40,
             .type = .Water,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // HydroPump
@@ -803,8 +773,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 120,
             .type = .Water,
-            .pp = 5,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // Surf
@@ -812,8 +781,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 95,
             .type = .Water,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // IceBeam
@@ -821,58 +789,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
@@ -880,8 +842,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 35,
             .type = .Flying,
-            .pp = 35,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Any,
         },
         // DrillPeck
@@ -889,8 +850,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 80,
             .type = .Flying,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Any,
         },
         // Submission
@@ -898,8 +858,7 @@ pub const Move = enum(u8) {
             .effect = .Recoil,
             .bp = 80,
             .type = .Fighting,
-            .pp = 25,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // LowKick
@@ -907,28 +866,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
@@ -936,8 +893,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 80,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Absorb
@@ -945,8 +901,7 @@ pub const Move = enum(u8) {
             .effect = .DrainHP,
             .bp = 20,
             .type = .Grass,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // MegaDrain
@@ -954,8 +909,7 @@ pub const Move = enum(u8) {
             .effect = .DrainHP,
             .bp = 40,
             .type = .Grass,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // LeechSeed
@@ -963,8 +917,7 @@ pub const Move = enum(u8) {
             .effect = .LeechSeed,
             .bp = 0,
             .type = .Grass,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Growth
@@ -972,8 +925,7 @@ pub const Move = enum(u8) {
             .effect = .SpAtkUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // RazorLeaf
@@ -981,26 +933,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
@@ -1008,8 +958,7 @@ pub const Move = enum(u8) {
             .effect = .Paralyze,
             .bp = 0,
             .type = .Grass,
-            .pp = 30,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // SleepPowder
@@ -1017,8 +966,7 @@ pub const Move = enum(u8) {
             .effect = .Sleep,
             .bp = 0,
             .type = .Grass,
-            .pp = 15,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // PetalDance
@@ -1026,17 +974,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
@@ -1044,8 +991,7 @@ pub const Move = enum(u8) {
             .effect = .FixedDamage,
             .bp = 0,
             .type = .Dragon,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // FireSpin
@@ -1053,37 +999,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
@@ -1091,18 +1034,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
@@ -1110,35 +1052,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
@@ -1146,28 +1087,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
@@ -1175,8 +1113,7 @@ pub const Move = enum(u8) {
             .effect = .AttackUp1,
             .bp = 0,
             .type = .Psychic,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Agility
@@ -1184,8 +1121,7 @@ pub const Move = enum(u8) {
             .effect = .SpeedUp2,
             .bp = 0,
             .type = .Psychic,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // QuickAttack
@@ -1193,8 +1129,7 @@ pub const Move = enum(u8) {
             .effect = .Priority,
             .bp = 40,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
             .priority = 1,
         },
@@ -1203,8 +1138,7 @@ pub const Move = enum(u8) {
             .effect = .Rage,
             .bp = 20,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Teleport
@@ -1212,8 +1146,7 @@ pub const Move = enum(u8) {
             .effect = .Teleport,
             .bp = 0,
             .type = .Psychic,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // NightShade
@@ -1221,8 +1154,7 @@ pub const Move = enum(u8) {
             .effect = .LevelDamage,
             .bp = 0,
             .type = .Ghost,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Mimic
@@ -1230,17 +1162,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
@@ -1248,8 +1179,7 @@ pub const Move = enum(u8) {
             .effect = .EvasionUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Recover
@@ -1257,8 +1187,7 @@ pub const Move = enum(u8) {
             .effect = .Heal,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Harden
@@ -1266,8 +1195,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Minimize
@@ -1275,8 +1203,7 @@ pub const Move = enum(u8) {
             .effect = .EvasionUp1,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Smokescreen
@@ -1284,8 +1211,7 @@ pub const Move = enum(u8) {
             .effect = .AccuracyDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // ConfuseRay
@@ -1293,8 +1219,7 @@ pub const Move = enum(u8) {
             .effect = .Confusion,
             .bp = 0,
             .type = .Ghost,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Withdraw
@@ -1302,8 +1227,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseUp1,
             .bp = 0,
             .type = .Water,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // DefenseCurl
@@ -1311,8 +1235,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseCurl,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Barrier
@@ -1320,8 +1243,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseUp2,
             .bp = 0,
             .type = .Psychic,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // LightScreen
@@ -1329,8 +1251,7 @@ pub const Move = enum(u8) {
             .effect = .LightScreen,
             .bp = 0,
             .type = .Psychic,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllySide,
         },
         // Haze
@@ -1338,8 +1259,7 @@ pub const Move = enum(u8) {
             .effect = .Haze,
             .bp = 0,
             .type = .Ice,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .All,
         },
         // Reflect
@@ -1347,8 +1267,7 @@ pub const Move = enum(u8) {
             .effect = .Reflect,
             .bp = 0,
             .type = .Psychic,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllySide,
         },
         // FocusEnergy
@@ -1356,8 +1275,7 @@ pub const Move = enum(u8) {
             .effect = .FocusEnergy,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Bide
@@ -1365,26 +1283,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
@@ -1392,8 +1309,7 @@ pub const Move = enum(u8) {
             .effect = .Explode,
             .bp = 200,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllOthers,
         },
         // EggBomb
@@ -1401,8 +1317,7 @@ pub const Move = enum(u8) {
             .effect = .None,
             .bp = 100,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // Lick
@@ -1410,58 +1325,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
@@ -1469,17 +1378,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
@@ -1487,17 +1395,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
@@ -1505,18 +1412,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
@@ -1524,8 +1429,7 @@ pub const Move = enum(u8) {
             .effect = .AccuracyDown1,
             .bp = 0,
             .type = .Psychic,
-            .pp = 15,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // SoftBoiled
@@ -1533,8 +1437,7 @@ pub const Move = enum(u8) {
             .effect = .Heal,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // HighJumpKick
@@ -1542,8 +1445,7 @@ pub const Move = enum(u8) {
             .effect = .JumpKick,
             .bp = 85,
             .type = .Fighting,
-            .pp = 20,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Glare
@@ -1551,8 +1453,7 @@ pub const Move = enum(u8) {
             .effect = .Paralyze,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // DreamEater
@@ -1560,8 +1461,7 @@ pub const Move = enum(u8) {
             .effect = .DreamEater,
             .bp = 100,
             .type = .Psychic,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // PoisonGas
@@ -1569,8 +1469,7 @@ pub const Move = enum(u8) {
             .effect = .Poison,
             .bp = 0,
             .type = .Poison,
-            .pp = 40,
-            .accuracy = 55,
+            .accuracy = percent(55),
             .target = .Other,
         },
         // Barrage
@@ -1578,8 +1477,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 15,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // LeechLife
@@ -1587,8 +1485,7 @@ pub const Move = enum(u8) {
             .effect = .DrainHP,
             .bp = 20,
             .type = .Bug,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // LovelyKiss
@@ -1596,8 +1493,7 @@ pub const Move = enum(u8) {
             .effect = .Sleep,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // SkyAttack
@@ -1605,17 +1501,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
@@ -1623,28 +1518,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
@@ -1652,8 +1544,7 @@ pub const Move = enum(u8) {
             .effect = .AccuracyDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 70,
+            .accuracy = percent(70),
             .target = .Other,
         },
         // Psywave
@@ -1661,8 +1552,7 @@ pub const Move = enum(u8) {
             .effect = .Psywave,
             .bp = 0,
             .type = .Psychic,
-            .pp = 15,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // Splash
@@ -1670,8 +1560,7 @@ pub const Move = enum(u8) {
             .effect = .Splash,
             .bp = 0,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // AcidArmor
@@ -1679,8 +1568,7 @@ pub const Move = enum(u8) {
             .effect = .DefenseUp2,
             .bp = 0,
             .type = .Poison,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Crabhammer
@@ -1688,8 +1576,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 90,
             .type = .Water,
-            .pp = 10,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // Explosion
@@ -1697,8 +1584,7 @@ pub const Move = enum(u8) {
             .effect = .Explode,
             .bp = 250,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllOthers,
         },
         // FurySwipes
@@ -1706,8 +1592,7 @@ pub const Move = enum(u8) {
             .effect = .MultiHit,
             .bp = 18,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // Bonemerang
@@ -1715,8 +1600,7 @@ pub const Move = enum(u8) {
             .effect = .DoubleHit,
             .bp = 50,
             .type = .Ground,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Rest
@@ -1724,8 +1608,7 @@ pub const Move = enum(u8) {
             .effect = .Heal,
             .bp = 0,
             .type = .Psychic,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // RockSlide
@@ -1733,28 +1616,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
@@ -1762,8 +1642,7 @@ pub const Move = enum(u8) {
             .effect = .Conversion,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // TriAttack
@@ -1771,18 +1650,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
@@ -1790,8 +1667,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 70,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Substitute
@@ -1799,8 +1675,7 @@ pub const Move = enum(u8) {
             .effect = .Substitute,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Struggle
@@ -1808,26 +1683,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
@@ -1835,18 +1709,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
@@ -1854,8 +1727,7 @@ pub const Move = enum(u8) {
             .effect = .LockOn,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Nightmare
@@ -1863,8 +1735,7 @@ pub const Move = enum(u8) {
             .effect = .Nightmare,
             .bp = 0,
             .type = .Ghost,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // FlameWheel
@@ -1872,28 +1743,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
@@ -1901,8 +1769,7 @@ pub const Move = enum(u8) {
             .effect = .Reversal,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Conversion2
@@ -1910,8 +1777,7 @@ pub const Move = enum(u8) {
             .effect = .Conversion2,
             .bp = 0,
             .type = .Normal,
-            .pp = 30,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Aeroblast
@@ -1919,8 +1785,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 100,
             .type = .Flying,
-            .pp = 5,
-            .accuracy = 95,
+            .accuracy = percent(95),
             .target = .Any,
         },
         // CottonSpore
@@ -1928,8 +1793,7 @@ pub const Move = enum(u8) {
             .effect = .SpeedDown2,
             .bp = 0,
             .type = .Grass,
-            .pp = 40,
-            .accuracy = 85,
+            .accuracy = percent(85),
             .target = .Other,
         },
         // Reversal
@@ -1937,8 +1801,7 @@ pub const Move = enum(u8) {
             .effect = .Reversal,
             .bp = 0,
             .type = .Fighting,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Spite
@@ -1946,8 +1809,7 @@ pub const Move = enum(u8) {
             .effect = .Spite,
             .bp = 0,
             .type = .Ghost,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // PowderSnow
@@ -1955,28 +1817,26 @@ 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,
         },
@@ -1985,8 +1845,7 @@ pub const Move = enum(u8) {
             .effect = .SpeedDown2,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // FeintAttack
@@ -1994,8 +1853,7 @@ pub const Move = enum(u8) {
             .effect = .AlwaysHit,
             .bp = 60,
             .type = .Dark,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // SweetKiss
@@ -2003,8 +1861,7 @@ pub const Move = enum(u8) {
             .effect = .Confusion,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 75,
+            .accuracy = percent(75),
             .target = .Other,
         },
         // BellyDrum
@@ -2012,8 +1869,7 @@ pub const Move = enum(u8) {
             .effect = .BellyDrum,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // SludgeBomb
@@ -2021,38 +1877,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
@@ -2060,18 +1912,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
@@ -2079,17 +1929,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
@@ -2097,28 +1946,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
@@ -2126,8 +1973,7 @@ pub const Move = enum(u8) {
             .effect = .LockOn,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Outrage
@@ -2135,17 +1981,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
@@ -2153,8 +1998,7 @@ pub const Move = enum(u8) {
             .effect = .DrainHP,
             .bp = 60,
             .type = .Grass,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Endure
@@ -2162,18 +2006,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
@@ -2181,17 +2024,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
@@ -2199,8 +2041,7 @@ pub const Move = enum(u8) {
             .effect = .Swagger,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // MilkDrink
@@ -2208,8 +2049,7 @@ pub const Move = enum(u8) {
             .effect = .Heal,
             .bp = 0,
             .type = .Normal,
-            .pp = 10,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Spark
@@ -2217,18 +2057,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
@@ -2236,18 +2074,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
@@ -2255,8 +2091,7 @@ pub const Move = enum(u8) {
             .effect = .Attract,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // SleepTalk
@@ -2264,17 +2099,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
@@ -2282,8 +2116,7 @@ pub const Move = enum(u8) {
             .effect = .Return,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Present
@@ -2291,8 +2124,7 @@ pub const Move = enum(u8) {
             .effect = .Present,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 90,
+            .accuracy = percent(90),
             .target = .Other,
         },
         // Frustration
@@ -2300,8 +2132,7 @@ pub const Move = enum(u8) {
             .effect = .Frustration,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Safeguard
@@ -2309,8 +2140,7 @@ pub const Move = enum(u8) {
             .effect = .Safeguard,
             .bp = 0,
             .type = .Normal,
-            .pp = 25,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .AllySide,
         },
         // PainSplit
@@ -2318,8 +2148,7 @@ pub const Move = enum(u8) {
             .effect = .PainSplit,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // SacredFire
@@ -2327,37 +2156,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
@@ -2365,18 +2191,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
@@ -2384,8 +2208,7 @@ pub const Move = enum(u8) {
             .effect = .Encore,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // Pursuit
@@ -2393,8 +2216,7 @@ pub const Move = enum(u8) {
             .effect = .Pursuit,
             .bp = 40,
             .type = .Dark,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // RapidSpin
@@ -2402,8 +2224,7 @@ pub const Move = enum(u8) {
             .effect = .RapidSpin,
             .bp = 20,
             .type = .Normal,
-            .pp = 40,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // SweetScent
@@ -2411,8 +2232,7 @@ pub const Move = enum(u8) {
             .effect = .EvasionDown1,
             .bp = 0,
             .type = .Normal,
-            .pp = 20,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Foes,
         },
         // IronTail
@@ -2420,28 +2240,25 @@ 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,
         },
@@ -2450,8 +2267,7 @@ pub const Move = enum(u8) {
             .effect = .MorningSun,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Synthesis
@@ -2459,8 +2275,7 @@ pub const Move = enum(u8) {
             .effect = .Synthesis,
             .bp = 0,
             .type = .Grass,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // Moonlight
@@ -2468,8 +2283,7 @@ pub const Move = enum(u8) {
             .effect = .Moonlight,
             .bp = 0,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Self,
         },
         // HiddenPower
@@ -2477,8 +2291,7 @@ pub const Move = enum(u8) {
             .effect = .HiddenPower,
             .bp = 0,
             .type = .Normal,
-            .pp = 15,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
         },
         // CrossChop
@@ -2486,8 +2299,7 @@ pub const Move = enum(u8) {
             .effect = .HighCritical,
             .bp = 100,
             .type = .Fighting,
-            .pp = 5,
-            .accuracy = 80,
+            .accuracy = percent(80),
             .target = .Other,
         },
         // Twister
@@ -2495,18 +2307,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
@@ -2514,8 +2325,7 @@ pub const Move = enum(u8) {
             .effect = .SunnyDay,
             .bp = 0,
             .type = .Fire,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .All,
         },
         // Crunch
@@ -2523,28 +2333,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
@@ -2552,8 +2360,7 @@ pub const Move = enum(u8) {
             .effect = .Priority,
             .bp = 80,
             .type = .Normal,
-            .pp = 5,
-            .accuracy = 100,
+            .accuracy = percent(100),
             .target = .Other,
             .priority = 1,
         },
@@ -2562,28 +2369,25 @@ pub const Move = enum(u8) {
             .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
@@ -2591,27 +2395,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,
         },
     };
@@ -2664,7 +2466,7 @@ pub const Move = enum(u8) {
         FixedDamage,
         FlameWheel,
         FlinchChance,
-        Fly,
+        FlyDig,
         FocusEnergy,
         ForceSwitch,
         Foresight,
@@ -2727,7 +2529,7 @@ pub const Move = enum(u8) {
         Sleep,
         SleepTalk,
         Snore,
-        Solarbeam,
+        SolarBeam,
         SpAtkUp1,
         SpDefDownChance,
         SpDefUp2,
@@ -2758,6 +2560,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) {
@@ -2781,6 +2588,260 @@ 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)) == 2008);
@@ -2789,9 +2850,29 @@ pub const Move = enum(u8) {
     /// 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];
+    }
 };