diff --git a/include/struct_defs/trainer_data.h b/include/struct_defs/trainer_data.h index 2fb0225a64..0fdedc0fde 100644 --- a/include/struct_defs/trainer_data.h +++ b/include/struct_defs/trainer_data.h @@ -12,7 +12,7 @@ #define TRAINER_MON_FORM_SHIFT 10 #define MAX_TRAINER_ITEMS 4 -#define MAX_DV 255 +#define MAX_IV_SCALE 255 enum TrainerDataType { TRDATATYPE_BASE = 0, @@ -32,14 +32,14 @@ typedef struct TrainerHeader { } TrainerHeader; typedef struct TrainerMonBase { - u16 dv; + u16 ivScale; u16 level; u16 species; u16 cbSeal; } TrainerMonBase; typedef struct TrainerMonWithMoves { - u16 dv; + u16 ivScale; u16 level; u16 species; u16 moves[LEARNED_MOVES_MAX]; @@ -47,7 +47,7 @@ typedef struct TrainerMonWithMoves { } TrainerMonWithMoves; typedef struct TrainerMonWithItem { - u16 dv; + u16 ivScale; u16 level; u16 species; u16 item; @@ -55,7 +55,7 @@ typedef struct TrainerMonWithItem { } TrainerMonWithItem; typedef struct TrainerMonWithMovesAndItem { - u16 dv; + u16 ivScale; u16 level; u16 species; u16 item; diff --git a/res/trainers/data/ace_trainer_abel.json b/res/trainers/data/ace_trainer_abel.json index b373786d3e..e0adcb3004 100644 --- a/res/trainers/data/ace_trainer_abel.json +++ b/res/trainers/data/ace_trainer_abel.json @@ -20,7 +20,7 @@ "MOVE_SHEER_COLD", "MOVE_CRUNCH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_CONFUSE_RAY", "MOVE_SHADOW_BALL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_alicia.json b/res/trainers/data/ace_trainer_alicia.json index 5a47b5b074..c7c6e330ab 100644 --- a/res/trainers/data/ace_trainer_alicia.json +++ b/res/trainers/data/ace_trainer_alicia.json @@ -20,7 +20,7 @@ "MOVE_SCREECH", "MOVE_FAINT_ATTACK" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SCREECH", "MOVE_FAINT_ATTACK" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_allen.json b/res/trainers/data/ace_trainer_allen.json index 8695577951..049fedfbfb 100644 --- a/res/trainers/data/ace_trainer_allen.json +++ b/res/trainers/data/ace_trainer_allen.json @@ -20,7 +20,7 @@ "MOVE_CURSE", "MOVE_CONFUSE_RAY" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_HYPNOSIS", "MOVE_CONFUSE_RAY" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_CURSE", "MOVE_MEAN_LOOK" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_alyssa.json b/res/trainers/data/ace_trainer_alyssa.json index d4249eaf99..c26e3593b3 100644 --- a/res/trainers/data/ace_trainer_alyssa.json +++ b/res/trainers/data/ace_trainer_alyssa.json @@ -20,7 +20,7 @@ "MOVE_SHOCK_WAVE", "MOVE_AERIAL_ACE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ASSURANCE", "MOVE_LIGHT_SCREEN" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -47,7 +47,7 @@ "MOVE_BITE", "MOVE_CURSE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_anton.json b/res/trainers/data/ace_trainer_anton.json index 810c72bc97..9ad2ada961 100644 --- a/res/trainers/data/ace_trainer_anton.json +++ b/res/trainers/data/ace_trainer_anton.json @@ -18,7 +18,7 @@ "MOVE_ICE_BEAM", "MOVE_CRUNCH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_arthur.json b/res/trainers/data/ace_trainer_arthur.json index be76c9e33e..d043d58a94 100644 --- a/res/trainers/data/ace_trainer_arthur.json +++ b/res/trainers/data/ace_trainer_arthur.json @@ -20,7 +20,7 @@ "MOVE_TOXIC", "MOVE_WATER_PULSE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_AERIAL_ACE", "MOVE_SWORDS_DANCE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_ENDURE", "MOVE_EXPLOSION" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_blake.json b/res/trainers/data/ace_trainer_blake.json index 0e877a171a..5fb8b8c5c0 100644 --- a/res/trainers/data/ace_trainer_blake.json +++ b/res/trainers/data/ace_trainer_blake.json @@ -20,7 +20,7 @@ "MOVE_SAND_ATTACK", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_CONVERSION_2", "MOVE_RECOVER" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_brandi.json b/res/trainers/data/ace_trainer_brandi.json index 93e0591dd7..f4829043c9 100644 --- a/res/trainers/data/ace_trainer_brandi.json +++ b/res/trainers/data/ace_trainer_brandi.json @@ -20,7 +20,7 @@ "MOVE_SWORDS_DANCE", "MOVE_ENDEAVOR" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_OUTRAGE", "MOVE_EARTHQUAKE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_breanna.json b/res/trainers/data/ace_trainer_breanna.json index 3f12a799df..c0dd0fd7e1 100644 --- a/res/trainers/data/ace_trainer_breanna.json +++ b/res/trainers/data/ace_trainer_breanna.json @@ -19,7 +19,7 @@ "MOVE_EXTRASENSORY", "MOVE_CONFUSE_RAY" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_EXTRASENSORY", "MOVE_CONFUSE_RAY" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -45,7 +45,7 @@ "MOVE_EXTRASENSORY", "MOVE_CONFUSE_RAY" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_brenda.json b/res/trainers/data/ace_trainer_brenda.json index fed515478f..8be121b296 100644 --- a/res/trainers/data/ace_trainer_brenda.json +++ b/res/trainers/data/ace_trainer_brenda.json @@ -15,7 +15,7 @@ "level": 38, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 36, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 35, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_brenna.json b/res/trainers/data/ace_trainer_brenna.json index 96955cb384..57fcb367fc 100644 --- a/res/trainers/data/ace_trainer_brenna.json +++ b/res/trainers/data/ace_trainer_brenna.json @@ -20,7 +20,7 @@ "MOVE_FAINT_ATTACK", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_CRUNCH", "MOVE_HAIL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -47,7 +47,7 @@ "MOVE_INGRAIN", "MOVE_GRASS_WHISTLE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_catherine.json b/res/trainers/data/ace_trainer_catherine.json index 9022217738..cf8e134f4e 100644 --- a/res/trainers/data/ace_trainer_catherine.json +++ b/res/trainers/data/ace_trainer_catherine.json @@ -20,7 +20,7 @@ "MOVE_SUCKER_PUNCH", "MOVE_CURSE" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_CONFUSE_RAY", "MOVE_SPITE" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_cesar.json b/res/trainers/data/ace_trainer_cesar.json index 6a256c9db6..616163676e 100644 --- a/res/trainers/data/ace_trainer_cesar.json +++ b/res/trainers/data/ace_trainer_cesar.json @@ -20,7 +20,7 @@ "MOVE_SLASH", "MOVE_PURSUIT" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_clarice.json b/res/trainers/data/ace_trainer_clarice.json index b40d953467..62fb3d74ca 100644 --- a/res/trainers/data/ace_trainer_clarice.json +++ b/res/trainers/data/ace_trainer_clarice.json @@ -20,7 +20,7 @@ "MOVE_BODY_SLAM", "MOVE_PROTECT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_DARK_PULSE", "MOVE_EXTRASENSORY" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_DISCHARGE", "MOVE_HYPER_BEAM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_dalton.json b/res/trainers/data/ace_trainer_dalton.json index 66478e1645..385d603e97 100644 --- a/res/trainers/data/ace_trainer_dalton.json +++ b/res/trainers/data/ace_trainer_dalton.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_THUNDER_WAVE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SMOG", "MOVE_WILL_O_WISP" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_dalton_rematch.json b/res/trainers/data/ace_trainer_dalton_rematch.json index b01dfd1bdf..b2d0cbd1d8 100644 --- a/res/trainers/data/ace_trainer_dalton_rematch.json +++ b/res/trainers/data/ace_trainer_dalton_rematch.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_THUNDER_WAVE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SMOG", "MOVE_WILL_O_WISP" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_dana.json b/res/trainers/data/ace_trainer_dana.json index 5b8c6b2344..22f942d754 100644 --- a/res/trainers/data/ace_trainer_dana.json +++ b/res/trainers/data/ace_trainer_dana.json @@ -20,7 +20,7 @@ "MOVE_IRON_TAIL", "MOVE_SCARY_FACE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SHOCK_WAVE", "MOVE_SHADOW_BALL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 21 } ], diff --git a/res/trainers/data/ace_trainer_deanna.json b/res/trainers/data/ace_trainer_deanna.json index 17ab1feaf3..7a68a1f5fc 100644 --- a/res/trainers/data/ace_trainer_deanna.json +++ b/res/trainers/data/ace_trainer_deanna.json @@ -20,7 +20,7 @@ "MOVE_SIGNAL_BEAM", "MOVE_LIGHT_SCREEN" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SYNTHESIS", "MOVE_SUNNY_DAY" ], - "power": 50, + "iv_scale": 50, "ball_seal": 19 } ], diff --git a/res/trainers/data/ace_trainer_deanna_rematch.json b/res/trainers/data/ace_trainer_deanna_rematch.json index 3e19d76e27..b135784e8e 100644 --- a/res/trainers/data/ace_trainer_deanna_rematch.json +++ b/res/trainers/data/ace_trainer_deanna_rematch.json @@ -20,7 +20,7 @@ "MOVE_SIGNAL_BEAM", "MOVE_FIRE_PUNCH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_EARTHQUAKE", "MOVE_SILVER_WIND" ], - "power": 50, + "iv_scale": 50, "ball_seal": 19 } ], diff --git a/res/trainers/data/ace_trainer_dennis.json b/res/trainers/data/ace_trainer_dennis.json index 0c5c7c2be3..05312c5fc5 100644 --- a/res/trainers/data/ace_trainer_dennis.json +++ b/res/trainers/data/ace_trainer_dennis.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_POISON_STING" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_PURSUIT", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_STOCKPILE", "MOVE_OMINOUS_WIND" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_dennis_rematch_1.json b/res/trainers/data/ace_trainer_dennis_rematch_1.json index 282c43814f..66019e9407 100644 --- a/res/trainers/data/ace_trainer_dennis_rematch_1.json +++ b/res/trainers/data/ace_trainer_dennis_rematch_1.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_POISON_STING" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_PURSUIT", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_STOCKPILE", "MOVE_SHADOW_BALL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_dennis_rematch_2.json b/res/trainers/data/ace_trainer_dennis_rematch_2.json index 2fc51dcaa3..dc22b2b89e 100644 --- a/res/trainers/data/ace_trainer_dennis_rematch_2.json +++ b/res/trainers/data/ace_trainer_dennis_rematch_2.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_AERIAL_ACE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_CRUNCH", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_STOCKPILE", "MOVE_SHADOW_BALL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_destiny.json b/res/trainers/data/ace_trainer_destiny.json index 1cc69690a1..4cc952948b 100644 --- a/res/trainers/data/ace_trainer_destiny.json +++ b/res/trainers/data/ace_trainer_destiny.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_IRON_TAIL" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_THUNDER_WAVE", "MOVE_LIGHT_SCREEN" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_ernest.json b/res/trainers/data/ace_trainer_ernest.json index 77aa910cb0..c16754a938 100644 --- a/res/trainers/data/ace_trainer_ernest.json +++ b/res/trainers/data/ace_trainer_ernest.json @@ -20,7 +20,7 @@ "MOVE_PURSUIT", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_MAGNET_BOMB", "MOVE_IRON_DEFENSE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_SWAGGER", "MOVE_DOUBLE_TEAM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_felix.json b/res/trainers/data/ace_trainer_felix.json index f78f9ced7b..37c98cc99b 100644 --- a/res/trainers/data/ace_trainer_felix.json +++ b/res/trainers/data/ace_trainer_felix.json @@ -20,7 +20,7 @@ "MOVE_CURSE", "MOVE_WILL_O_WISP" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ZEN_HEADBUTT", "MOVE_CRUNCH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 23 } ], diff --git a/res/trainers/data/ace_trainer_garrett.json b/res/trainers/data/ace_trainer_garrett.json index a8a77bcd69..2f07f3bef7 100644 --- a/res/trainers/data/ace_trainer_garrett.json +++ b/res/trainers/data/ace_trainer_garrett.json @@ -20,7 +20,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_PURSUIT", "MOVE_CONFUSE_RAY" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_QUICK_ATTACK", "MOVE_FURY_CUTTER" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_graham.json b/res/trainers/data/ace_trainer_graham.json index a968a4c5f1..49ef46fda7 100644 --- a/res/trainers/data/ace_trainer_graham.json +++ b/res/trainers/data/ace_trainer_graham.json @@ -15,7 +15,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 59, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_henry.json b/res/trainers/data/ace_trainer_henry.json index d7a1a2d35f..f2fbe867fe 100644 --- a/res/trainers/data/ace_trainer_henry.json +++ b/res/trainers/data/ace_trainer_henry.json @@ -20,7 +20,7 @@ "MOVE_HAMMER_ARM", "MOVE_TAKE_DOWN" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_FAINT_ATTACK", "MOVE_INGRAIN" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_isaiah.json b/res/trainers/data/ace_trainer_isaiah.json index 1ec3243d4e..0c3b7e4c6b 100644 --- a/res/trainers/data/ace_trainer_isaiah.json +++ b/res/trainers/data/ace_trainer_isaiah.json @@ -20,7 +20,7 @@ "MOVE_ICE_FANG", "MOVE_ANCIENT_POWER" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_jake.json b/res/trainers/data/ace_trainer_jake.json index 233edc0bcd..31a7e29896 100644 --- a/res/trainers/data/ace_trainer_jake.json +++ b/res/trainers/data/ace_trainer_jake.json @@ -20,7 +20,7 @@ "MOVE_ENDEAVOR", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_DOUBLE_HIT", "MOVE_PSYCHIC" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_jake_rematch.json b/res/trainers/data/ace_trainer_jake_rematch.json index 657f548efa..c297c0403e 100644 --- a/res/trainers/data/ace_trainer_jake_rematch.json +++ b/res/trainers/data/ace_trainer_jake_rematch.json @@ -20,7 +20,7 @@ "MOVE_ENDEAVOR", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_CRUNCH", "MOVE_THUNDER_WAVE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_jamie.json b/res/trainers/data/ace_trainer_jamie.json index b520045f5a..f281be2d04 100644 --- a/res/trainers/data/ace_trainer_jamie.json +++ b/res/trainers/data/ace_trainer_jamie.json @@ -20,7 +20,7 @@ "MOVE_PSYCHIC", "MOVE_MAGNET_RISE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 11 } ], diff --git a/res/trainers/data/ace_trainer_jasmin.json b/res/trainers/data/ace_trainer_jasmin.json index 6bbf0bccbe..cf63323fe0 100644 --- a/res/trainers/data/ace_trainer_jasmin.json +++ b/res/trainers/data/ace_trainer_jasmin.json @@ -20,7 +20,7 @@ "MOVE_X_SCISSOR", "MOVE_AERIAL_ACE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_jonah.json b/res/trainers/data/ace_trainer_jonah.json index 0722b534b9..ef34e46e4f 100644 --- a/res/trainers/data/ace_trainer_jonah.json +++ b/res/trainers/data/ace_trainer_jonah.json @@ -15,7 +15,7 @@ "level": 35, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 36, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 38, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_jose.json b/res/trainers/data/ace_trainer_jose.json index 374fd501f0..0a591fe6ab 100644 --- a/res/trainers/data/ace_trainer_jose.json +++ b/res/trainers/data/ace_trainer_jose.json @@ -20,7 +20,7 @@ "MOVE_ZEN_HEADBUTT", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_POISON_JAB", "MOVE_SAND_TOMB" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_QUICK_ATTACK", "MOVE_GIGA_IMPACT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_kassandra.json b/res/trainers/data/ace_trainer_kassandra.json index 7349f59e54..c2934ade0a 100644 --- a/res/trainers/data/ace_trainer_kassandra.json +++ b/res/trainers/data/ace_trainer_kassandra.json @@ -20,7 +20,7 @@ "MOVE_TOXIC", "MOVE_BOUNCE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_IRON_TAIL", "MOVE_DRAGON_BREATH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_SIGNAL_BEAM", "MOVE_FIRE_PUNCH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_keenan.json b/res/trainers/data/ace_trainer_keenan.json index 2a292341e2..12f5cf9e46 100644 --- a/res/trainers/data/ace_trainer_keenan.json +++ b/res/trainers/data/ace_trainer_keenan.json @@ -15,7 +15,7 @@ "level": 58, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 58, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 59, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_laura.json b/res/trainers/data/ace_trainer_laura.json index 59e0d001c7..7939fb0ae2 100644 --- a/res/trainers/data/ace_trainer_laura.json +++ b/res/trainers/data/ace_trainer_laura.json @@ -20,7 +20,7 @@ "MOVE_MAGICAL_LEAF", "MOVE_SWEET_SCENT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_maria.json b/res/trainers/data/ace_trainer_maria.json index d56dfebdf5..b13b565676 100644 --- a/res/trainers/data/ace_trainer_maria.json +++ b/res/trainers/data/ace_trainer_maria.json @@ -20,7 +20,7 @@ "MOVE_DISABLE", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_FURY_ATTACK", "MOVE_WILL_O_WISP" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_FLAIL", "MOVE_ENDURE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_mariah.json b/res/trainers/data/ace_trainer_mariah.json index 33f688f69a..93441f6363 100644 --- a/res/trainers/data/ace_trainer_mariah.json +++ b/res/trainers/data/ace_trainer_mariah.json @@ -20,7 +20,7 @@ "MOVE_SOFTBOILED", "MOVE_LIGHT_SCREEN" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_HEADBUTT", "MOVE_SHADOW_BALL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_THUNDER_WAVE", "MOVE_BARRIER" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_maya.json b/res/trainers/data/ace_trainer_maya.json index 8a157a1cb1..63dc8a8cdf 100644 --- a/res/trainers/data/ace_trainer_maya.json +++ b/res/trainers/data/ace_trainer_maya.json @@ -19,7 +19,7 @@ "MOVE_GIGA_DRAIN", "MOVE_LEECH_SEED" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_CALM_MIND", "MOVE_DOUBLE_TEAM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -47,7 +47,7 @@ "MOVE_ROLLOUT", "MOVE_DEFENSE_CURL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_maya_rematch_1.json b/res/trainers/data/ace_trainer_maya_rematch_1.json index 522f53ad15..0fb08814b0 100644 --- a/res/trainers/data/ace_trainer_maya_rematch_1.json +++ b/res/trainers/data/ace_trainer_maya_rematch_1.json @@ -20,7 +20,7 @@ "MOVE_LEECH_SEED", "MOVE_TOXIC" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_CALM_MIND", "MOVE_DOUBLE_TEAM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_ROLLOUT", "MOVE_DEFENSE_CURL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_maya_rematch_2.json b/res/trainers/data/ace_trainer_maya_rematch_2.json index aa0012ab59..0b04777713 100644 --- a/res/trainers/data/ace_trainer_maya_rematch_2.json +++ b/res/trainers/data/ace_trainer_maya_rematch_2.json @@ -20,7 +20,7 @@ "MOVE_LEECH_SEED", "MOVE_TOXIC" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_CALM_MIND", "MOVE_DOUBLE_TEAM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_SCREECH", "MOVE_POWER_WHIP" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_meagan.json b/res/trainers/data/ace_trainer_meagan.json index 8bd2120e5d..f836ed4ea7 100644 --- a/res/trainers/data/ace_trainer_meagan.json +++ b/res/trainers/data/ace_trainer_meagan.json @@ -20,7 +20,7 @@ "MOVE_FAINT_ATTACK", "MOVE_DOUBLE_EDGE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_RAZOR_LEAF", "MOVE_WATER_PULSE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_micah.json b/res/trainers/data/ace_trainer_micah.json index 9ce7fef7e6..9316a49e36 100644 --- a/res/trainers/data/ace_trainer_micah.json +++ b/res/trainers/data/ace_trainer_micah.json @@ -20,7 +20,7 @@ "MOVE_PURSUIT", "MOVE_METEOR_MASH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ENERGY_BALL", "MOVE_FAKE_OUT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_mikayla.json b/res/trainers/data/ace_trainer_mikayla.json index 60ffdf76db..dd9d2f62b8 100644 --- a/res/trainers/data/ace_trainer_mikayla.json +++ b/res/trainers/data/ace_trainer_mikayla.json @@ -20,7 +20,7 @@ "MOVE_WRING_OUT", "MOVE_GLARE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_FAINT_ATTACK", "MOVE_FAKE_OUT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_SLASH", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_moira.json b/res/trainers/data/ace_trainer_moira.json index 4e7fb8613f..725c914c0b 100644 --- a/res/trainers/data/ace_trainer_moira.json +++ b/res/trainers/data/ace_trainer_moira.json @@ -20,7 +20,7 @@ "MOVE_DIG", "MOVE_X_SCISSOR" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_BODY_SLAM", "MOVE_PROTECT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_ANCIENT_POWER", "MOVE_COSMIC_POWER" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_moira_rematch.json b/res/trainers/data/ace_trainer_moira_rematch.json index 3b2fb13467..2828032774 100644 --- a/res/trainers/data/ace_trainer_moira_rematch.json +++ b/res/trainers/data/ace_trainer_moira_rematch.json @@ -20,7 +20,7 @@ "MOVE_DIG", "MOVE_X_SCISSOR" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_BODY_SLAM", "MOVE_PROTECT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_ANCIENT_POWER", "MOVE_COSMIC_POWER" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_monique.json b/res/trainers/data/ace_trainer_monique.json index f3ae74e1c8..a7a4ed40c7 100644 --- a/res/trainers/data/ace_trainer_monique.json +++ b/res/trainers/data/ace_trainer_monique.json @@ -20,7 +20,7 @@ "MOVE_THUNDER_WAVE", "MOVE_FACADE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SWORDS_DANCE", "MOVE_GIGA_IMPACT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_EARTHQUAKE", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_natasha.json b/res/trainers/data/ace_trainer_natasha.json index 359b6960d7..90ac3ca4e5 100644 --- a/res/trainers/data/ace_trainer_natasha.json +++ b/res/trainers/data/ace_trainer_natasha.json @@ -20,7 +20,7 @@ "MOVE_LIGHT_SCREEN", "MOVE_SHADOW_BALL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_CALM_MIND", "MOVE_FOCUS_BLAST" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_PSYCHIC", "MOVE_ROCK_SLIDE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_olivia.json b/res/trainers/data/ace_trainer_olivia.json index 044c74c505..f4217f0819 100644 --- a/res/trainers/data/ace_trainer_olivia.json +++ b/res/trainers/data/ace_trainer_olivia.json @@ -20,7 +20,7 @@ "MOVE_MAGICAL_LEAF", "MOVE_LUCKY_CHANT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SUPERSONIC", "MOVE_AQUA_RING" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_JUMP_KICK", "MOVE_SHADOW_BALL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_olivia_rematch.json b/res/trainers/data/ace_trainer_olivia_rematch.json index 237dfc50ce..6ba0d8c769 100644 --- a/res/trainers/data/ace_trainer_olivia_rematch.json +++ b/res/trainers/data/ace_trainer_olivia_rematch.json @@ -20,7 +20,7 @@ "MOVE_MAGICAL_LEAF", "MOVE_CALM_MIND" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_WATER_PULSE", "MOVE_POISON_JAB" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_DRAIN_PUNCH", "MOVE_SHADOW_BALL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_omar.json b/res/trainers/data/ace_trainer_omar.json index 9e7e0b5e2c..8e78f834de 100644 --- a/res/trainers/data/ace_trainer_omar.json +++ b/res/trainers/data/ace_trainer_omar.json @@ -20,7 +20,7 @@ "MOVE_ROCK_SLIDE", "MOVE_GIGA_IMPACT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_PSYCHIC", "MOVE_TOXIC" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_ANCIENT_POWER", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_quinn.json b/res/trainers/data/ace_trainer_quinn.json index 22d9d2590b..6492d7f723 100644 --- a/res/trainers/data/ace_trainer_quinn.json +++ b/res/trainers/data/ace_trainer_quinn.json @@ -20,7 +20,7 @@ "MOVE_SWORDS_DANCE", "MOVE_ROCK_TOMB" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SURF", "MOVE_CONFUSE_RAY" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_rodolfo.json b/res/trainers/data/ace_trainer_rodolfo.json index e43a676487..b12e5374ee 100644 --- a/res/trainers/data/ace_trainer_rodolfo.json +++ b/res/trainers/data/ace_trainer_rodolfo.json @@ -20,7 +20,7 @@ "MOVE_PSYCHIC", "MOVE_SWIFT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_FAINT_ATTACK", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_rodolfo_rematch.json b/res/trainers/data/ace_trainer_rodolfo_rematch.json index 22bc20c9f6..5cc52b538c 100644 --- a/res/trainers/data/ace_trainer_rodolfo_rematch.json +++ b/res/trainers/data/ace_trainer_rodolfo_rematch.json @@ -20,7 +20,7 @@ "MOVE_PSYCHIC", "MOVE_SWIFT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_FAINT_ATTACK", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_ruben.json b/res/trainers/data/ace_trainer_ruben.json index bbbff0c5bc..be7477c986 100644 --- a/res/trainers/data/ace_trainer_ruben.json +++ b/res/trainers/data/ace_trainer_ruben.json @@ -20,7 +20,7 @@ "MOVE_FAINT_ATTACK", "MOVE_RAZOR_LEAF" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_DRAGON_DANCE", "MOVE_ICE_FANG" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_sandra.json b/res/trainers/data/ace_trainer_sandra.json index be53464bce..2e10f14e6a 100644 --- a/res/trainers/data/ace_trainer_sandra.json +++ b/res/trainers/data/ace_trainer_sandra.json @@ -15,7 +15,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 54, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 54, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_saul.json b/res/trainers/data/ace_trainer_saul.json index a95ad048f7..baf640b854 100644 --- a/res/trainers/data/ace_trainer_saul.json +++ b/res/trainers/data/ace_trainer_saul.json @@ -20,7 +20,7 @@ "MOVE_SWAGGER", "MOVE_PAYBACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 12 } ], diff --git a/res/trainers/data/ace_trainer_saul_rematch.json b/res/trainers/data/ace_trainer_saul_rematch.json index 44d091bb07..805ad0e760 100644 --- a/res/trainers/data/ace_trainer_saul_rematch.json +++ b/res/trainers/data/ace_trainer_saul_rematch.json @@ -20,7 +20,7 @@ "MOVE_EARTHQUAKE", "MOVE_STONE_EDGE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 12 } ], diff --git a/res/trainers/data/ace_trainer_savannah.json b/res/trainers/data/ace_trainer_savannah.json index 469e794b3b..5874362c09 100644 --- a/res/trainers/data/ace_trainer_savannah.json +++ b/res/trainers/data/ace_trainer_savannah.json @@ -20,7 +20,7 @@ "MOVE_HAIL", "MOVE_PROTECT" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_HAIL", "MOVE_PROTECT" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_HAIL", "MOVE_PROTECT" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_sergio.json b/res/trainers/data/ace_trainer_sergio.json index ab820ff411..5981a36418 100644 --- a/res/trainers/data/ace_trainer_sergio.json +++ b/res/trainers/data/ace_trainer_sergio.json @@ -20,7 +20,7 @@ "MOVE_ICY_WIND", "MOVE_WOOD_HAMMER" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_FAINT_ATTACK", "MOVE_QUICK_ATTACK" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_shannon.json b/res/trainers/data/ace_trainer_shannon.json index 112146ec76..3f8e3df20d 100644 --- a/res/trainers/data/ace_trainer_shannon.json +++ b/res/trainers/data/ace_trainer_shannon.json @@ -19,7 +19,7 @@ "MOVE_MAGICAL_LEAF", "MOVE_LEECH_SEED" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_BUBBLE_BEAM", "MOVE_AQUA_RING" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -45,7 +45,7 @@ "MOVE_QUICK_ATTACK", "MOVE_CHARM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_shannon_rematch.json b/res/trainers/data/ace_trainer_shannon_rematch.json index 70ff1ea4f4..b89987934d 100644 --- a/res/trainers/data/ace_trainer_shannon_rematch.json +++ b/res/trainers/data/ace_trainer_shannon_rematch.json @@ -20,7 +20,7 @@ "MOVE_PETAL_DANCE", "MOVE_SUNNY_DAY" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_AQUA_TAIL", "MOVE_AQUA_RING" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_QUICK_ATTACK", "MOVE_BOUNCE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_skylar.json b/res/trainers/data/ace_trainer_skylar.json index 7e99e80fb1..c45a522d87 100644 --- a/res/trainers/data/ace_trainer_skylar.json +++ b/res/trainers/data/ace_trainer_skylar.json @@ -20,7 +20,7 @@ "MOVE_SUPERSONIC", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ANCIENT_POWER", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_ROOST", "MOVE_QUICK_ATTACK" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_stefan.json b/res/trainers/data/ace_trainer_stefan.json index 77278e135d..545377cde9 100644 --- a/res/trainers/data/ace_trainer_stefan.json +++ b/res/trainers/data/ace_trainer_stefan.json @@ -15,7 +15,7 @@ "level": 58, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 61, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_sydney.json b/res/trainers/data/ace_trainer_sydney.json index c98f96b4cb..0ee322e549 100644 --- a/res/trainers/data/ace_trainer_sydney.json +++ b/res/trainers/data/ace_trainer_sydney.json @@ -20,7 +20,7 @@ "MOVE_LIGHT_SCREEN", "MOVE_GRAVITY" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_LEECH_SEED", "MOVE_SYNTHESIS" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ace_trainer_zachery.json b/res/trainers/data/ace_trainer_zachery.json index 08e8a04e41..f9598534e4 100644 --- a/res/trainers/data/ace_trainer_zachery.json +++ b/res/trainers/data/ace_trainer_zachery.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_IRON_TAIL" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_TRI_ATTACK", "MOVE_MIRROR_SHOT" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/arcade_star_dahlia_dummy.json b/res/trainers/data/arcade_star_dahlia_dummy.json index 8c6431963d..0eaaf67bb0 100644 --- a/res/trainers/data/arcade_star_dahlia_dummy.json +++ b/res/trainers/data/arcade_star_dahlia_dummy.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_alison.json b/res/trainers/data/aroma_lady_alison.json index 8683f6d3fc..f3a0193175 100644 --- a/res/trainers/data/aroma_lady_alison.json +++ b/res/trainers/data/aroma_lady_alison.json @@ -14,7 +14,7 @@ "level": 28, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_angela.json b/res/trainers/data/aroma_lady_angela.json index f81144a872..285e235180 100644 --- a/res/trainers/data/aroma_lady_angela.json +++ b/res/trainers/data/aroma_lady_angela.json @@ -18,7 +18,7 @@ "MOVE_POISON_STING", "MOVE_STUN_SPORE" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_elizabeth.json b/res/trainers/data/aroma_lady_elizabeth.json index 63fab43e6b..92af314316 100644 --- a/res/trainers/data/aroma_lady_elizabeth.json +++ b/res/trainers/data/aroma_lady_elizabeth.json @@ -17,7 +17,7 @@ "MOVE_GROWTH", "MOVE_MEGA_DRAIN" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_elizabeth_rematch_1.json b/res/trainers/data/aroma_lady_elizabeth_rematch_1.json index 7dc05dfa77..550bb306a1 100644 --- a/res/trainers/data/aroma_lady_elizabeth_rematch_1.json +++ b/res/trainers/data/aroma_lady_elizabeth_rematch_1.json @@ -14,7 +14,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_elizabeth_rematch_2.json b/res/trainers/data/aroma_lady_elizabeth_rematch_2.json index 8242f957e0..bf55b8225c 100644 --- a/res/trainers/data/aroma_lady_elizabeth_rematch_2.json +++ b/res/trainers/data/aroma_lady_elizabeth_rematch_2.json @@ -14,7 +14,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_elizabeth_rematch_3.json b/res/trainers/data/aroma_lady_elizabeth_rematch_3.json index 03fcb2b5e9..4d2feab811 100644 --- a/res/trainers/data/aroma_lady_elizabeth_rematch_3.json +++ b/res/trainers/data/aroma_lady_elizabeth_rematch_3.json @@ -14,7 +14,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_hannah.json b/res/trainers/data/aroma_lady_hannah.json index cbadf9accd..cf9126a39c 100644 --- a/res/trainers/data/aroma_lady_hannah.json +++ b/res/trainers/data/aroma_lady_hannah.json @@ -14,7 +14,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 1 }, { @@ -23,7 +23,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_jenna.json b/res/trainers/data/aroma_lady_jenna.json index 76f81d6e13..570bc717e5 100644 --- a/res/trainers/data/aroma_lady_jenna.json +++ b/res/trainers/data/aroma_lady_jenna.json @@ -18,7 +18,7 @@ "MOVE_STUN_SPORE", "MOVE_WATER_SPORT" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "MOVE_STUN_SPORE", "MOVE_WATER_SPORT" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 }, { @@ -44,7 +44,7 @@ "MOVE_STUN_SPORE", "MOVE_WATER_SPORT" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/aroma_lady_taylor.json b/res/trainers/data/aroma_lady_taylor.json index efe1133b20..f19aa0ab8e 100644 --- a/res/trainers/data/aroma_lady_taylor.json +++ b/res/trainers/data/aroma_lady_taylor.json @@ -14,7 +14,7 @@ "level": 9, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/artist_ismael.json b/res/trainers/data/artist_ismael.json index e9137c96cd..c02d081d95 100644 --- a/res/trainers/data/artist_ismael.json +++ b/res/trainers/data/artist_ismael.json @@ -13,7 +13,7 @@ "level": 28, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/artist_william.json b/res/trainers/data/artist_william.json index bf312ec882..4384f7b7f5 100644 --- a/res/trainers/data/artist_william.json +++ b/res/trainers/data/artist_william.json @@ -13,7 +13,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/artist_william_rematch_1.json b/res/trainers/data/artist_william_rematch_1.json index 5e82600524..1c233c1d0b 100644 --- a/res/trainers/data/artist_william_rematch_1.json +++ b/res/trainers/data/artist_william_rematch_1.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/artist_william_rematch_2.json b/res/trainers/data/artist_william_rematch_2.json index 1289ba8ae2..ddfde1f199 100644 --- a/res/trainers/data/artist_william_rematch_2.json +++ b/res/trainers/data/artist_william_rematch_2.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/artist_william_rematch_3.json b/res/trainers/data/artist_william_rematch_3.json index afce6cafa3..f03bd23334 100644 --- a/res/trainers/data/artist_william_rematch_3.json +++ b/res/trainers/data/artist_william_rematch_3.json @@ -18,7 +18,7 @@ "MOVE_SILVER_WIND", "MOVE_BATON_PASS" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_REFLECT", "MOVE_MIMIC" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -46,7 +46,7 @@ "MOVE_SUCKER_PUNCH", "MOVE_MIMIC" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/battle_girl_helen.json b/res/trainers/data/battle_girl_helen.json index 528e9cde16..cb82549e98 100644 --- a/res/trainers/data/battle_girl_helen.json +++ b/res/trainers/data/battle_girl_helen.json @@ -14,7 +14,7 @@ "level": 21, "item": null, "moves": null, - "power": 20, + "iv_scale": 20, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 21, "item": null, "moves": null, - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/battle_girl_helen_rematch_1.json b/res/trainers/data/battle_girl_helen_rematch_1.json index b512d40e5f..a9ceb89f80 100644 --- a/res/trainers/data/battle_girl_helen_rematch_1.json +++ b/res/trainers/data/battle_girl_helen_rematch_1.json @@ -14,7 +14,7 @@ "level": 23, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 23, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/battle_girl_helen_rematch_2.json b/res/trainers/data/battle_girl_helen_rematch_2.json index 4f91c29583..ec3d1e3f3b 100644 --- a/res/trainers/data/battle_girl_helen_rematch_2.json +++ b/res/trainers/data/battle_girl_helen_rematch_2.json @@ -14,7 +14,7 @@ "level": 44, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 44, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/battle_girl_helen_rematch_3.json b/res/trainers/data/battle_girl_helen_rematch_3.json index 20cd4c096a..8c1a14a1ec 100644 --- a/res/trainers/data/battle_girl_helen_rematch_3.json +++ b/res/trainers/data/battle_girl_helen_rematch_3.json @@ -14,7 +14,7 @@ "level": 60, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 60, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/battle_girl_kelsey.json b/res/trainers/data/battle_girl_kelsey.json index fd525321f5..450554ae3a 100644 --- a/res/trainers/data/battle_girl_kelsey.json +++ b/res/trainers/data/battle_girl_kelsey.json @@ -14,7 +14,7 @@ "level": 15, "item": null, "moves": null, - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/battle_girl_tyler.json b/res/trainers/data/battle_girl_tyler.json index e3f182b0f1..3726a017b2 100644 --- a/res/trainers/data/battle_girl_tyler.json +++ b/res/trainers/data/battle_girl_tyler.json @@ -14,7 +14,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/beauty_cyndy.json b/res/trainers/data/beauty_cyndy.json index 6130c26897..e377094bd1 100644 --- a/res/trainers/data/beauty_cyndy.json +++ b/res/trainers/data/beauty_cyndy.json @@ -13,7 +13,7 @@ "level": 29, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/beauty_cyndy_rematch_1.json b/res/trainers/data/beauty_cyndy_rematch_1.json index caeadba5e1..f3fe7b3917 100644 --- a/res/trainers/data/beauty_cyndy_rematch_1.json +++ b/res/trainers/data/beauty_cyndy_rematch_1.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/beauty_cyndy_rematch_2.json b/res/trainers/data/beauty_cyndy_rematch_2.json index 84372f79c7..3a4af90abe 100644 --- a/res/trainers/data/beauty_cyndy_rematch_2.json +++ b/res/trainers/data/beauty_cyndy_rematch_2.json @@ -13,7 +13,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/beauty_devon.json b/res/trainers/data/beauty_devon.json index 0f93d1ca59..878962ef7c 100644 --- a/res/trainers/data/beauty_devon.json +++ b/res/trainers/data/beauty_devon.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/beauty_gabriella.json b/res/trainers/data/beauty_gabriella.json index 541c3d82c6..b30fe2ae18 100644 --- a/res/trainers/data/beauty_gabriella.json +++ b/res/trainers/data/beauty_gabriella.json @@ -13,7 +13,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/beauty_harley.json b/res/trainers/data/beauty_harley.json index 27c47dc3d5..b2018e78f8 100644 --- a/res/trainers/data/beauty_harley.json +++ b/res/trainers/data/beauty_harley.json @@ -13,7 +13,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/beauty_lindsay.json b/res/trainers/data/beauty_lindsay.json index 7836412476..1c22bc28d1 100644 --- a/res/trainers/data/beauty_lindsay.json +++ b/res/trainers/data/beauty_lindsay.json @@ -17,7 +17,7 @@ "MOVE_POISON_STING", "MOVE_STUN_SPORE" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/beauty_nicola.json b/res/trainers/data/beauty_nicola.json index bfdfa072c5..d028aea73e 100644 --- a/res/trainers/data/beauty_nicola.json +++ b/res/trainers/data/beauty_nicola.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/belle_and_pa_ava_and_matt.json b/res/trainers/data/belle_and_pa_ava_and_matt.json index 54fa1fe056..546aa19a01 100644 --- a/res/trainers/data/belle_and_pa_ava_and_matt.json +++ b/res/trainers/data/belle_and_pa_ava_and_matt.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/belle_and_pa_beth_and_bob.json b/res/trainers/data/belle_and_pa_beth_and_bob.json index f368b65b8c..e36e3cc945 100644 --- a/res/trainers/data/belle_and_pa_beth_and_bob.json +++ b/res/trainers/data/belle_and_pa_beth_and_bob.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_alexandra.json b/res/trainers/data/bird_keeper_alexandra.json index 209bae1f01..223cf34217 100644 --- a/res/trainers/data/bird_keeper_alexandra.json +++ b/res/trainers/data/bird_keeper_alexandra.json @@ -13,7 +13,7 @@ "level": 17, "item": null, "moves": null, - "power": 20, + "iv_scale": 20, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 17, "item": null, "moves": null, - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_audrey.json b/res/trainers/data/bird_keeper_audrey.json index a7bef05249..60c80c84c8 100644 --- a/res/trainers/data/bird_keeper_audrey.json +++ b/res/trainers/data/bird_keeper_audrey.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_audrey_rematch.json b/res/trainers/data/bird_keeper_audrey_rematch.json index 3879d8552a..25de8617a3 100644 --- a/res/trainers/data/bird_keeper_audrey_rematch.json +++ b/res/trainers/data/bird_keeper_audrey_rematch.json @@ -13,7 +13,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 61, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_autumn.json b/res/trainers/data/bird_keeper_autumn.json index e8b35e113f..ac17fe5eab 100644 --- a/res/trainers/data/bird_keeper_autumn.json +++ b/res/trainers/data/bird_keeper_autumn.json @@ -13,7 +13,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_brianna.json b/res/trainers/data/bird_keeper_brianna.json index 98ab2ee91d..2fa8c49342 100644 --- a/res/trainers/data/bird_keeper_brianna.json +++ b/res/trainers/data/bird_keeper_brianna.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_brianna_rematch_1.json b/res/trainers/data/bird_keeper_brianna_rematch_1.json index 1edaebe5bc..dd37fa93a2 100644 --- a/res/trainers/data/bird_keeper_brianna_rematch_1.json +++ b/res/trainers/data/bird_keeper_brianna_rematch_1.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 44, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_brianna_rematch_2.json b/res/trainers/data/bird_keeper_brianna_rematch_2.json index 5e73f1bb13..fcd670ec5a 100644 --- a/res/trainers/data/bird_keeper_brianna_rematch_2.json +++ b/res/trainers/data/bird_keeper_brianna_rematch_2.json @@ -18,7 +18,7 @@ "MOVE_AIR_SLASH", "MOVE_STEEL_WING" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_ROOST", "MOVE_AIR_SLASH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -46,7 +46,7 @@ "MOVE_ROOST", "MOVE_AIR_SLASH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_geneva.json b/res/trainers/data/bird_keeper_geneva.json index 62dccb258e..0d79ecb8bb 100644 --- a/res/trainers/data/bird_keeper_geneva.json +++ b/res/trainers/data/bird_keeper_geneva.json @@ -13,7 +13,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_hana.json b/res/trainers/data/bird_keeper_hana.json index b6a875e450..bbd3b7b447 100644 --- a/res/trainers/data/bird_keeper_hana.json +++ b/res/trainers/data/bird_keeper_hana.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 47, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_katherine.json b/res/trainers/data/bird_keeper_katherine.json index 9865d90b19..97a21eac4c 100644 --- a/res/trainers/data/bird_keeper_katherine.json +++ b/res/trainers/data/bird_keeper_katherine.json @@ -13,7 +13,7 @@ "level": 34, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/bird_keeper_krystal.json b/res/trainers/data/bird_keeper_krystal.json index 9fbf8e44cc..73e3327a04 100644 --- a/res/trainers/data/bird_keeper_krystal.json +++ b/res/trainers/data/bird_keeper_krystal.json @@ -13,7 +13,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_adam.json b/res/trainers/data/black_belt_adam.json index e77b7a51ee..164e9e7b99 100644 --- a/res/trainers/data/black_belt_adam.json +++ b/res/trainers/data/black_belt_adam.json @@ -14,7 +14,7 @@ "level": 34, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_carl.json b/res/trainers/data/black_belt_carl.json index d6380375b7..d31cc06638 100644 --- a/res/trainers/data/black_belt_carl.json +++ b/res/trainers/data/black_belt_carl.json @@ -14,7 +14,7 @@ "level": 55, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 59, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_colby.json b/res/trainers/data/black_belt_colby.json index ffba7ec62c..8deee286df 100644 --- a/res/trainers/data/black_belt_colby.json +++ b/res/trainers/data/black_belt_colby.json @@ -18,7 +18,7 @@ "MOVE_LEER", "MOVE_FORESIGHT" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_LOW_KICK", "MOVE_FORESIGHT" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 }, { @@ -43,7 +43,7 @@ "MOVE_LEER", "MOVE_FORESIGHT" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_darren.json b/res/trainers/data/black_belt_darren.json index 887fcc8551..59bbb75625 100644 --- a/res/trainers/data/black_belt_darren.json +++ b/res/trainers/data/black_belt_darren.json @@ -17,7 +17,7 @@ "MOVE_KARATE_CHOP", "MOVE_FORESIGHT" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 }, { @@ -29,7 +29,7 @@ "MOVE_CONFUSION", "MOVE_FORCE_PALM" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 }, { @@ -41,7 +41,7 @@ "MOVE_KARATE_CHOP", "MOVE_FORESIGHT" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_david.json b/res/trainers/data/black_belt_david.json index e594960f00..b57a581c9e 100644 --- a/res/trainers/data/black_belt_david.json +++ b/res/trainers/data/black_belt_david.json @@ -19,7 +19,7 @@ "MOVE_SANDSTORM", "MOVE_SCREECH" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_SANDSTORM", "MOVE_SCREECH" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_davon.json b/res/trainers/data/black_belt_davon.json index de42a30217..d558878fa1 100644 --- a/res/trainers/data/black_belt_davon.json +++ b/res/trainers/data/black_belt_davon.json @@ -14,7 +14,7 @@ "level": 54, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 54, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 57, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_davon_rematch.json b/res/trainers/data/black_belt_davon_rematch.json index ebab33a334..66626a01ac 100644 --- a/res/trainers/data/black_belt_davon_rematch.json +++ b/res/trainers/data/black_belt_davon_rematch.json @@ -14,7 +14,7 @@ "level": 59, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 59, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 59, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_derek.json b/res/trainers/data/black_belt_derek.json index 0db4a9764c..f8f05d7180 100644 --- a/res/trainers/data/black_belt_derek.json +++ b/res/trainers/data/black_belt_derek.json @@ -14,7 +14,7 @@ "level": 26, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_eddie.json b/res/trainers/data/black_belt_eddie.json index 106b0d6183..546035e149 100644 --- a/res/trainers/data/black_belt_eddie.json +++ b/res/trainers/data/black_belt_eddie.json @@ -14,7 +14,7 @@ "level": 51, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 53, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 55, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_gregory.json b/res/trainers/data/black_belt_gregory.json index 7c5e7b51e4..81ed596b2a 100644 --- a/res/trainers/data/black_belt_gregory.json +++ b/res/trainers/data/black_belt_gregory.json @@ -14,7 +14,7 @@ "level": 23, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 23, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 23, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_griffin.json b/res/trainers/data/black_belt_griffin.json index 8dbc0df26a..35b434ffda 100644 --- a/res/trainers/data/black_belt_griffin.json +++ b/res/trainers/data/black_belt_griffin.json @@ -19,7 +19,7 @@ "MOVE_SEED_BOMB", "MOVE_SKY_UPPERCUT" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_HI_JUMP_KICK", "MOVE_ICE_PUNCH" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_jarrett.json b/res/trainers/data/black_belt_jarrett.json index 8977bae698..846763b19b 100644 --- a/res/trainers/data/black_belt_jarrett.json +++ b/res/trainers/data/black_belt_jarrett.json @@ -19,7 +19,7 @@ "MOVE_ICE_PUNCH", "MOVE_THUNDER_PUNCH" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_jeffery.json b/res/trainers/data/black_belt_jeffery.json index 82122a7d1e..9af343af77 100644 --- a/res/trainers/data/black_belt_jeffery.json +++ b/res/trainers/data/black_belt_jeffery.json @@ -18,7 +18,7 @@ "MOVE_AERIAL_ACE", "MOVE_LEER" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_kendal.json b/res/trainers/data/black_belt_kendal.json index 2c87637478..4ac93d5353 100644 --- a/res/trainers/data/black_belt_kendal.json +++ b/res/trainers/data/black_belt_kendal.json @@ -14,7 +14,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_kyle.json b/res/trainers/data/black_belt_kyle.json index bffcd396ea..b503ea1f3d 100644 --- a/res/trainers/data/black_belt_kyle.json +++ b/res/trainers/data/black_belt_kyle.json @@ -14,7 +14,7 @@ "level": 23, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_luke.json b/res/trainers/data/black_belt_luke.json index 77b8d33b7c..aab3aacafd 100644 --- a/res/trainers/data/black_belt_luke.json +++ b/res/trainers/data/black_belt_luke.json @@ -14,7 +14,7 @@ "level": 37, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 37, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 37, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_miles.json b/res/trainers/data/black_belt_miles.json index 212ce95a3e..3dd5114fbc 100644 --- a/res/trainers/data/black_belt_miles.json +++ b/res/trainers/data/black_belt_miles.json @@ -14,7 +14,7 @@ "level": 48, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_nathaniel.json b/res/trainers/data/black_belt_nathaniel.json index f4f01c1a9e..9fce915c9e 100644 --- a/res/trainers/data/black_belt_nathaniel.json +++ b/res/trainers/data/black_belt_nathaniel.json @@ -14,7 +14,7 @@ "level": 21, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 24, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 24, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_philip.json b/res/trainers/data/black_belt_philip.json index 89664db451..5dea38b5fe 100644 --- a/res/trainers/data/black_belt_philip.json +++ b/res/trainers/data/black_belt_philip.json @@ -14,7 +14,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_philip_rematch.json b/res/trainers/data/black_belt_philip_rematch.json index 9a0263d2e7..83e76c4e1b 100644 --- a/res/trainers/data/black_belt_philip_rematch.json +++ b/res/trainers/data/black_belt_philip_rematch.json @@ -14,7 +14,7 @@ "level": 55, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_rafael.json b/res/trainers/data/black_belt_rafael.json index 1828d8f2bd..6646a68245 100644 --- a/res/trainers/data/black_belt_rafael.json +++ b/res/trainers/data/black_belt_rafael.json @@ -18,7 +18,7 @@ "MOVE_REVENGE", "MOVE_FAINT_ATTACK" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_KARATE_CHOP", "MOVE_FORESIGHT" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_ray.json b/res/trainers/data/black_belt_ray.json index 691e07c1dc..ab9586079d 100644 --- a/res/trainers/data/black_belt_ray.json +++ b/res/trainers/data/black_belt_ray.json @@ -19,7 +19,7 @@ "MOVE_SKY_UPPERCUT", "MOVE_SPORE" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_FOCUS_BLAST", "MOVE_DARK_PULSE" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_ricky.json b/res/trainers/data/black_belt_ricky.json index 6bdc4b04f2..fe01a11566 100644 --- a/res/trainers/data/black_belt_ricky.json +++ b/res/trainers/data/black_belt_ricky.json @@ -19,7 +19,7 @@ "MOVE_TORMENT", "MOVE_SCREECH" ], - "power": 40, + "iv_scale": 40, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_sean.json b/res/trainers/data/black_belt_sean.json index 37c27beaff..6b9a880de2 100644 --- a/res/trainers/data/black_belt_sean.json +++ b/res/trainers/data/black_belt_sean.json @@ -14,7 +14,7 @@ "level": 31, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 31, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 31, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/black_belt_willie.json b/res/trainers/data/black_belt_willie.json index e70e6f4ac0..492cd65d94 100644 --- a/res/trainers/data/black_belt_willie.json +++ b/res/trainers/data/black_belt_willie.json @@ -14,7 +14,7 @@ "level": 54, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 54, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_albert.json b/res/trainers/data/breeder_albert.json index d97a46e1c3..54c39cad9b 100644 --- a/res/trainers/data/breeder_albert.json +++ b/res/trainers/data/breeder_albert.json @@ -13,7 +13,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_albert_rematch_1.json b/res/trainers/data/breeder_albert_rematch_1.json index 908d490494..1d69901069 100644 --- a/res/trainers/data/breeder_albert_rematch_1.json +++ b/res/trainers/data/breeder_albert_rematch_1.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_albert_rematch_2.json b/res/trainers/data/breeder_albert_rematch_2.json index 9705362f7b..858cf52ff7 100644 --- a/res/trainers/data/breeder_albert_rematch_2.json +++ b/res/trainers/data/breeder_albert_rematch_2.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_albert_rematch_3.json b/res/trainers/data/breeder_albert_rematch_3.json index 8dec3efd08..7272c7ab8d 100644 --- a/res/trainers/data/breeder_albert_rematch_3.json +++ b/res/trainers/data/breeder_albert_rematch_3.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_amber.json b/res/trainers/data/breeder_amber.json index df5b27faef..20e9ef4d31 100644 --- a/res/trainers/data/breeder_amber.json +++ b/res/trainers/data/breeder_amber.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_jennifer.json b/res/trainers/data/breeder_jennifer.json index 3c3e8a0cd6..734926a3ae 100644 --- a/res/trainers/data/breeder_jennifer.json +++ b/res/trainers/data/breeder_jennifer.json @@ -13,7 +13,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_jennifer_rematch_1.json b/res/trainers/data/breeder_jennifer_rematch_1.json index ab2058a3f7..c445a4644c 100644 --- a/res/trainers/data/breeder_jennifer_rematch_1.json +++ b/res/trainers/data/breeder_jennifer_rematch_1.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_jennifer_rematch_2.json b/res/trainers/data/breeder_jennifer_rematch_2.json index 02af5b6ba8..a27e79568d 100644 --- a/res/trainers/data/breeder_jennifer_rematch_2.json +++ b/res/trainers/data/breeder_jennifer_rematch_2.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_jennifer_rematch_3.json b/res/trainers/data/breeder_jennifer_rematch_3.json index c0ac6f3327..c866fe95eb 100644 --- a/res/trainers/data/breeder_jennifer_rematch_3.json +++ b/res/trainers/data/breeder_jennifer_rematch_3.json @@ -13,7 +13,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_kahlil.json b/res/trainers/data/breeder_kahlil.json index ea0581c2ec..1123e219aa 100644 --- a/res/trainers/data/breeder_kahlil.json +++ b/res/trainers/data/breeder_kahlil.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/breeder_kaylee.json b/res/trainers/data/breeder_kaylee.json index 75102747af..d41895181a 100644 --- a/res/trainers/data/breeder_kaylee.json +++ b/res/trainers/data/breeder_kaylee.json @@ -13,7 +13,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/buck_battleground.json b/res/trainers/data/buck_battleground.json index f4695b6d5f..bc5c840750 100644 --- a/res/trainers/data/buck_battleground.json +++ b/res/trainers/data/buck_battleground.json @@ -23,7 +23,7 @@ "MOVE_PROTECT", "MOVE_SANDSTORM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_CONFUSE_RAY", "MOVE_DOUBLE_TEAM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_ERUPTION", "MOVE_PROTECT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_THUNDER_PUNCH", "MOVE_SHADOW_BALL" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_ANCIENT_POWER", "MOVE_CALM_MIND" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/buck_stark_mountain.json b/res/trainers/data/buck_stark_mountain.json index 1e006004c3..fd275e99df 100644 --- a/res/trainers/data/buck_stark_mountain.json +++ b/res/trainers/data/buck_stark_mountain.json @@ -20,7 +20,7 @@ "MOVE_LIGHT_SCREEN", "MOVE_REFLECT" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/bug_catcher_brandon.json b/res/trainers/data/bug_catcher_brandon.json index 57f5b0dd9e..2dd39d1c61 100644 --- a/res/trainers/data/bug_catcher_brandon.json +++ b/res/trainers/data/bug_catcher_brandon.json @@ -18,7 +18,7 @@ "MOVE_STRING_SHOT", "MOVE_POISON_STING" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -29,7 +29,7 @@ "moves": [ "MOVE_BIDE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bug_catcher_brandon_rematch_1.json b/res/trainers/data/bug_catcher_brandon_rematch_1.json index b080013f37..b8b38624fb 100644 --- a/res/trainers/data/bug_catcher_brandon_rematch_1.json +++ b/res/trainers/data/bug_catcher_brandon_rematch_1.json @@ -13,7 +13,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bug_catcher_brandon_rematch_2.json b/res/trainers/data/bug_catcher_brandon_rematch_2.json index 1066d6066a..0a148670f4 100644 --- a/res/trainers/data/bug_catcher_brandon_rematch_2.json +++ b/res/trainers/data/bug_catcher_brandon_rematch_2.json @@ -13,7 +13,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bug_catcher_brandon_rematch_3.json b/res/trainers/data/bug_catcher_brandon_rematch_3.json index ca1f6525fb..9d8a60a75d 100644 --- a/res/trainers/data/bug_catcher_brandon_rematch_3.json +++ b/res/trainers/data/bug_catcher_brandon_rematch_3.json @@ -13,7 +13,7 @@ "level": 49, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/bug_catcher_donald.json b/res/trainers/data/bug_catcher_donald.json index ce49c931e5..3fbf3effbb 100644 --- a/res/trainers/data/bug_catcher_donald.json +++ b/res/trainers/data/bug_catcher_donald.json @@ -13,7 +13,7 @@ "level": 14, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 14, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/bug_catcher_jack.json b/res/trainers/data/bug_catcher_jack.json index 111b3fe8e7..679a171cad 100644 --- a/res/trainers/data/bug_catcher_jack.json +++ b/res/trainers/data/bug_catcher_jack.json @@ -17,7 +17,7 @@ "MOVE_STRING_SHOT", "MOVE_POISON_STING" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "MOVE_POISON_STING", "MOVE_HARDEN" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -45,7 +45,7 @@ "MOVE_ABSORB", "MOVE_GUST" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/bug_catcher_phillip.json b/res/trainers/data/bug_catcher_phillip.json index bc5674730d..b4e44b7747 100644 --- a/res/trainers/data/bug_catcher_phillip.json +++ b/res/trainers/data/bug_catcher_phillip.json @@ -17,7 +17,7 @@ "MOVE_STRING_SHOT", "MOVE_POISON_STING" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "MOVE_POISON_STING", "MOVE_HARDEN" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -45,7 +45,7 @@ "MOVE_CONFUSION", "MOVE_GUST" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/cameraman_darryl.json b/res/trainers/data/cameraman_darryl.json index 30dd415927..5b2135be25 100644 --- a/res/trainers/data/cameraman_darryl.json +++ b/res/trainers/data/cameraman_darryl.json @@ -13,7 +13,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cameraman_tevin.json b/res/trainers/data/cameraman_tevin.json index 02f016a5f6..7bcda09c50 100644 --- a/res/trainers/data/cameraman_tevin.json +++ b/res/trainers/data/cameraman_tevin.json @@ -13,7 +13,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cameraman_tevin_rematch_1.json b/res/trainers/data/cameraman_tevin_rematch_1.json index e2af4ddb29..6316669a58 100644 --- a/res/trainers/data/cameraman_tevin_rematch_1.json +++ b/res/trainers/data/cameraman_tevin_rematch_1.json @@ -13,7 +13,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cameraman_tevin_rematch_2.json b/res/trainers/data/cameraman_tevin_rematch_2.json index ca12469545..172474755b 100644 --- a/res/trainers/data/cameraman_tevin_rematch_2.json +++ b/res/trainers/data/cameraman_tevin_rematch_2.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cameraman_tevin_rematch_3.json b/res/trainers/data/cameraman_tevin_rematch_3.json index 71a0283a30..52d13bd489 100644 --- a/res/trainers/data/cameraman_tevin_rematch_3.json +++ b/res/trainers/data/cameraman_tevin_rematch_3.json @@ -13,7 +13,7 @@ "level": 48, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 48, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 49, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cameraman_tevin_rematch_4.json b/res/trainers/data/cameraman_tevin_rematch_4.json index e78ebf7653..ffb8d9aa53 100644 --- a/res/trainers/data/cameraman_tevin_rematch_4.json +++ b/res/trainers/data/cameraman_tevin_rematch_4.json @@ -13,7 +13,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cameraman_tevin_unused.json b/res/trainers/data/cameraman_tevin_unused.json index c5df42ff8f..763dc775b3 100644 --- a/res/trainers/data/cameraman_tevin_unused.json +++ b/res/trainers/data/cameraman_tevin_unused.json @@ -13,7 +13,7 @@ "level": 6, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_anthony.json b/res/trainers/data/camper_anthony.json index 19611c6c6f..56a2e0ee08 100644 --- a/res/trainers/data/camper_anthony.json +++ b/res/trainers/data/camper_anthony.json @@ -15,7 +15,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_curtis.json b/res/trainers/data/camper_curtis.json index 7988e53896..ed2dcf80b1 100644 --- a/res/trainers/data/camper_curtis.json +++ b/res/trainers/data/camper_curtis.json @@ -15,7 +15,7 @@ "level": 7, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 7, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_diego.json b/res/trainers/data/camper_diego.json index 6503c6fd24..b567126e46 100644 --- a/res/trainers/data/camper_diego.json +++ b/res/trainers/data/camper_diego.json @@ -15,7 +15,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_drew.json b/res/trainers/data/camper_drew.json index 1b87d6003b..e6c44a7175 100644 --- a/res/trainers/data/camper_drew.json +++ b/res/trainers/data/camper_drew.json @@ -19,7 +19,7 @@ "MOVE_SUCKER_PUNCH", "MOVE_CONFUSE_RAY" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_NIGHT_SHADE", "MOVE_CONFUSE_RAY" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -45,7 +45,7 @@ "MOVE_PAYBACK", "MOVE_CONFUSE_RAY" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_jacob.json b/res/trainers/data/camper_jacob.json index 2338ec50f1..0b3837b398 100644 --- a/res/trainers/data/camper_jacob.json +++ b/res/trainers/data/camper_jacob.json @@ -18,7 +18,7 @@ "MOVE_EMBER", "MOVE_TACKLE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_lawrence.json b/res/trainers/data/camper_lawrence.json index ef9ca39c7e..75cdac0140 100644 --- a/res/trainers/data/camper_lawrence.json +++ b/res/trainers/data/camper_lawrence.json @@ -15,7 +15,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_parker.json b/res/trainers/data/camper_parker.json index 9ccbcab4db..dfa15e666e 100644 --- a/res/trainers/data/camper_parker.json +++ b/res/trainers/data/camper_parker.json @@ -19,7 +19,7 @@ "MOVE_SWIFT", "MOVE_QUICK_ATTACK" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "MOVE_SPARK", "MOVE_BITE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_zackary.json b/res/trainers/data/camper_zackary.json index 0408745241..ed5d73f91e 100644 --- a/res/trainers/data/camper_zackary.json +++ b/res/trainers/data/camper_zackary.json @@ -15,7 +15,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_zackary_rematch_1.json b/res/trainers/data/camper_zackary_rematch_1.json index 288d60bcb5..51bedf0a3c 100644 --- a/res/trainers/data/camper_zackary_rematch_1.json +++ b/res/trainers/data/camper_zackary_rematch_1.json @@ -15,7 +15,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_zackary_rematch_2.json b/res/trainers/data/camper_zackary_rematch_2.json index 30560e08c9..deee889719 100644 --- a/res/trainers/data/camper_zackary_rematch_2.json +++ b/res/trainers/data/camper_zackary_rematch_2.json @@ -15,7 +15,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/camper_zackary_rematch_3.json b/res/trainers/data/camper_zackary_rematch_3.json index d2eb39ffc7..9f547ab267 100644 --- a/res/trainers/data/camper_zackary_rematch_3.json +++ b/res/trainers/data/camper_zackary_rematch_3.json @@ -20,7 +20,7 @@ "MOVE_NASTY_PLOT", "MOVE_WATER_PULSE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SURF", "MOVE_SHADOW_BALL" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/castle_valet_darach_dummy.json b/res/trainers/data/castle_valet_darach_dummy.json index 32e2564e5b..98b33bd919 100644 --- a/res/trainers/data/castle_valet_darach_dummy.json +++ b/res/trainers/data/castle_valet_darach_dummy.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/champion_cynthia.json b/res/trainers/data/champion_cynthia.json index bf8216a25e..1456eca66a 100644 --- a/res/trainers/data/champion_cynthia.json +++ b/res/trainers/data/champion_cynthia.json @@ -25,7 +25,7 @@ "MOVE_SILVER_WIND", "MOVE_SHADOW_BALL" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -39,7 +39,7 @@ "MOVE_TOXIC", "MOVE_EXTRASENSORY" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -53,7 +53,7 @@ "MOVE_WATER_PULSE", "MOVE_SHOCK_WAVE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -67,7 +67,7 @@ "MOVE_SHADOW_BALL", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -81,7 +81,7 @@ "MOVE_MIRROR_COAT", "MOVE_DRAGON_PULSE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -95,7 +95,7 @@ "MOVE_FLAMETHROWER", "MOVE_GIGA_IMPACT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/champion_cynthia_rematch.json b/res/trainers/data/champion_cynthia_rematch.json index 1a30229d59..01fc8f90ce 100644 --- a/res/trainers/data/champion_cynthia_rematch.json +++ b/res/trainers/data/champion_cynthia_rematch.json @@ -25,7 +25,7 @@ "MOVE_SILVER_WIND", "MOVE_OMINOUS_WIND" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -39,7 +39,7 @@ "MOVE_SHADOW_BALL", "MOVE_EXTRASENSORY" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -53,7 +53,7 @@ "MOVE_WATER_PULSE", "MOVE_PSYCHIC" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -67,7 +67,7 @@ "MOVE_PSYCHIC", "MOVE_EARTHQUAKE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -81,7 +81,7 @@ "MOVE_MIRROR_COAT", "MOVE_AQUA_RING" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -95,7 +95,7 @@ "MOVE_BRICK_BREAK", "MOVE_GIGA_IMPACT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/cheryl_battleground.json b/res/trainers/data/cheryl_battleground.json index d1f64a00f8..46af893a14 100644 --- a/res/trainers/data/cheryl_battleground.json +++ b/res/trainers/data/cheryl_battleground.json @@ -23,7 +23,7 @@ "MOVE_SAFEGUARD", "MOVE_ENCORE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_FLY", "MOVE_PROTECT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_BULLET_PUNCH", "MOVE_STONE_EDGE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_EARTHQUAKE", "MOVE_AVALANCHE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_PSYCHIC", "MOVE_TOXIC" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/cheryl_eterna_forest.json b/res/trainers/data/cheryl_eterna_forest.json index 42bc4ea26f..25ab66a7fe 100644 --- a/res/trainers/data/cheryl_eterna_forest.json +++ b/res/trainers/data/cheryl_eterna_forest.json @@ -19,7 +19,7 @@ "MOVE_SOFTBOILED", "MOVE_REFRESH" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/clown_lee.json b/res/trainers/data/clown_lee.json index 727fa1b6fe..5463ed8ab5 100644 --- a/res/trainers/data/clown_lee.json +++ b/res/trainers/data/clown_lee.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 } ], diff --git a/res/trainers/data/clown_lee_rematch_1.json b/res/trainers/data/clown_lee_rematch_1.json index 5913c50d42..c2b43cf92b 100644 --- a/res/trainers/data/clown_lee_rematch_1.json +++ b/res/trainers/data/clown_lee_rematch_1.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 } ], diff --git a/res/trainers/data/clown_lee_rematch_2.json b/res/trainers/data/clown_lee_rematch_2.json index 5d5384aa11..326e6c8d2b 100644 --- a/res/trainers/data/clown_lee_rematch_2.json +++ b/res/trainers/data/clown_lee_rematch_2.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 }, { @@ -22,7 +22,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 }, { @@ -31,7 +31,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 } ], diff --git a/res/trainers/data/clown_lee_rematch_3.json b/res/trainers/data/clown_lee_rematch_3.json index 3e473896a1..0c7e7e0d6d 100644 --- a/res/trainers/data/clown_lee_rematch_3.json +++ b/res/trainers/data/clown_lee_rematch_3.json @@ -13,7 +13,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 }, { @@ -22,7 +22,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 }, { @@ -31,7 +31,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 } ], diff --git a/res/trainers/data/clown_lee_rematch_4.json b/res/trainers/data/clown_lee_rematch_4.json index 8b99d79ac1..b66c79a3c4 100644 --- a/res/trainers/data/clown_lee_rematch_4.json +++ b/res/trainers/data/clown_lee_rematch_4.json @@ -13,7 +13,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 }, { @@ -22,7 +22,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 }, { @@ -31,7 +31,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 } ], diff --git a/res/trainers/data/clown_lee_unused.json b/res/trainers/data/clown_lee_unused.json index c1204fa5d9..5250c83e5a 100644 --- a/res/trainers/data/clown_lee_unused.json +++ b/res/trainers/data/clown_lee_unused.json @@ -13,7 +13,7 @@ "level": 6, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 3 } ], diff --git a/res/trainers/data/collector_brady.json b/res/trainers/data/collector_brady.json index 9a967e204c..6cc5b054ee 100644 --- a/res/trainers/data/collector_brady.json +++ b/res/trainers/data/collector_brady.json @@ -13,7 +13,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -49,7 +49,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -58,7 +58,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_dean.json b/res/trainers/data/collector_dean.json index 6898f73258..07867afc37 100644 --- a/res/trainers/data/collector_dean.json +++ b/res/trainers/data/collector_dean.json @@ -13,7 +13,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_douglas.json b/res/trainers/data/collector_douglas.json index b0b878b228..8865f5fb27 100644 --- a/res/trainers/data/collector_douglas.json +++ b/res/trainers/data/collector_douglas.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_edwin.json b/res/trainers/data/collector_edwin.json index fbeb790ff2..7f2d7483dc 100644 --- a/res/trainers/data/collector_edwin.json +++ b/res/trainers/data/collector_edwin.json @@ -13,7 +13,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_eugene.json b/res/trainers/data/collector_eugene.json index c88a645001..46312249dd 100644 --- a/res/trainers/data/collector_eugene.json +++ b/res/trainers/data/collector_eugene.json @@ -13,7 +13,7 @@ "level": 28, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_fernando.json b/res/trainers/data/collector_fernando.json index f78558afdd..b81c9b912d 100644 --- a/res/trainers/data/collector_fernando.json +++ b/res/trainers/data/collector_fernando.json @@ -13,7 +13,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_ivan.json b/res/trainers/data/collector_ivan.json index 6e1e6525ee..3516ada259 100644 --- a/res/trainers/data/collector_ivan.json +++ b/res/trainers/data/collector_ivan.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_ivan_rematch.json b/res/trainers/data/collector_ivan_rematch.json index f37789128a..cde1b75a6a 100644 --- a/res/trainers/data/collector_ivan_rematch.json +++ b/res/trainers/data/collector_ivan_rematch.json @@ -13,7 +13,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_jamal.json b/res/trainers/data/collector_jamal.json index ad52d1fc7b..17748b68d3 100644 --- a/res/trainers/data/collector_jamal.json +++ b/res/trainers/data/collector_jamal.json @@ -13,7 +13,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/collector_terry.json b/res/trainers/data/collector_terry.json index 76b133b23a..be0ceefd28 100644 --- a/res/trainers/data/collector_terry.json +++ b/res/trainers/data/collector_terry.json @@ -13,7 +13,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_jupiter_spear_pillar.json b/res/trainers/data/commander_jupiter_spear_pillar.json index 19230c4022..df12751e08 100644 --- a/res/trainers/data/commander_jupiter_spear_pillar.json +++ b/res/trainers/data/commander_jupiter_spear_pillar.json @@ -21,7 +21,7 @@ "MOVE_ROCK_SLIDE", "MOVE_REFLECT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -35,7 +35,7 @@ "MOVE_GIGA_DRAIN", "MOVE_MEAN_LOOK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -49,7 +49,7 @@ "MOVE_FLAMETHROWER", "MOVE_SMOKE_SCREEN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_jupiter_stark_mountain.json b/res/trainers/data/commander_jupiter_stark_mountain.json index 532c32490a..b9c89620c3 100644 --- a/res/trainers/data/commander_jupiter_stark_mountain.json +++ b/res/trainers/data/commander_jupiter_stark_mountain.json @@ -21,7 +21,7 @@ "MOVE_ROCK_SLIDE", "MOVE_REFLECT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -35,7 +35,7 @@ "MOVE_GIGA_DRAIN", "MOVE_MEAN_LOOK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -49,7 +49,7 @@ "MOVE_FLAMETHROWER", "MOVE_SMOKE_SCREEN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_jupiter_team_galactic_eterna_building.json b/res/trainers/data/commander_jupiter_team_galactic_eterna_building.json index 71eecaba17..5ca14f8dc8 100644 --- a/res/trainers/data/commander_jupiter_team_galactic_eterna_building.json +++ b/res/trainers/data/commander_jupiter_team_galactic_eterna_building.json @@ -19,7 +19,7 @@ "MOVE_WING_ATTACK", "MOVE_BITE" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_SCREECH", "MOVE_SMOKE_SCREEN" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_mars_lake_verity.json b/res/trainers/data/commander_mars_lake_verity.json index 4cf2564749..60fa529190 100644 --- a/res/trainers/data/commander_mars_lake_verity.json +++ b/res/trainers/data/commander_mars_lake_verity.json @@ -20,7 +20,7 @@ "MOVE_TOXIC", "MOVE_SUPERSONIC" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_IRON_DEFENSE", "MOVE_CONFUSE_RAY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_HYPNOSIS", "MOVE_FAKE_OUT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_mars_spear_pillar.json b/res/trainers/data/commander_mars_spear_pillar.json index 05e6a9165e..9b9fd8d669 100644 --- a/res/trainers/data/commander_mars_spear_pillar.json +++ b/res/trainers/data/commander_mars_spear_pillar.json @@ -21,7 +21,7 @@ "MOVE_LIGHT_SCREEN", "MOVE_CONFUSE_RAY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -35,7 +35,7 @@ "MOVE_POISON_FANG", "MOVE_CONFUSE_RAY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -49,7 +49,7 @@ "MOVE_AERIAL_ACE", "MOVE_HYPNOSIS" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_mars_stark_mountain.json b/res/trainers/data/commander_mars_stark_mountain.json index 38aa450e96..deed600951 100644 --- a/res/trainers/data/commander_mars_stark_mountain.json +++ b/res/trainers/data/commander_mars_stark_mountain.json @@ -21,7 +21,7 @@ "MOVE_LIGHT_SCREEN", "MOVE_CONFUSE_RAY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -35,7 +35,7 @@ "MOVE_POISON_FANG", "MOVE_CONFUSE_RAY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -49,7 +49,7 @@ "MOVE_AERIAL_ACE", "MOVE_HYPNOSIS" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_mars_valley_windworks.json b/res/trainers/data/commander_mars_valley_windworks.json index 94c802d8e5..8bd0f061eb 100644 --- a/res/trainers/data/commander_mars_valley_windworks.json +++ b/res/trainers/data/commander_mars_valley_windworks.json @@ -19,7 +19,7 @@ "MOVE_LEECH_LIFE", "MOVE_TOXIC" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_SCRATCH", "MOVE_FAKE_OUT" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_saturn_galactic_hq.json b/res/trainers/data/commander_saturn_galactic_hq.json index 49fbd67939..dcf6998071 100644 --- a/res/trainers/data/commander_saturn_galactic_hq.json +++ b/res/trainers/data/commander_saturn_galactic_hq.json @@ -20,7 +20,7 @@ "MOVE_POISON_FANG", "MOVE_CONFUSE_RAY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SHADOW_BALL", "MOVE_CONFUSE_RAY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_X_SCISSOR", "MOVE_FAINT_ATTACK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/commander_saturn_valor_cavern.json b/res/trainers/data/commander_saturn_valor_cavern.json index 4b2173a2de..a69ed40276 100644 --- a/res/trainers/data/commander_saturn_valor_cavern.json +++ b/res/trainers/data/commander_saturn_valor_cavern.json @@ -20,7 +20,7 @@ "MOVE_TOXIC", "MOVE_SUPERSONIC" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ROCK_TOMB", "MOVE_IRON_DEFENSE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_MUD_BOMB", "MOVE_FAINT_ATTACK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/cowgirl_shelley.json b/res/trainers/data/cowgirl_shelley.json index 45983444ad..240b3817f8 100644 --- a/res/trainers/data/cowgirl_shelley.json +++ b/res/trainers/data/cowgirl_shelley.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_axel.json b/res/trainers/data/cyclist_axel.json index 8ca26ecdb5..f0174e4a97 100644 --- a/res/trainers/data/cyclist_axel.json +++ b/res/trainers/data/cyclist_axel.json @@ -13,7 +13,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_james.json b/res/trainers/data/cyclist_james.json index 3a72753899..3d727a3efd 100644 --- a/res/trainers/data/cyclist_james.json +++ b/res/trainers/data/cyclist_james.json @@ -13,7 +13,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_john.json b/res/trainers/data/cyclist_john.json index f1a321d606..70fc2bbd3e 100644 --- a/res/trainers/data/cyclist_john.json +++ b/res/trainers/data/cyclist_john.json @@ -13,7 +13,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_john_rematch_1.json b/res/trainers/data/cyclist_john_rematch_1.json index a94c2a6a5a..fc4c6feea9 100644 --- a/res/trainers/data/cyclist_john_rematch_1.json +++ b/res/trainers/data/cyclist_john_rematch_1.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_john_rematch_2.json b/res/trainers/data/cyclist_john_rematch_2.json index 45b79a801f..0c8830e411 100644 --- a/res/trainers/data/cyclist_john_rematch_2.json +++ b/res/trainers/data/cyclist_john_rematch_2.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_john_rematch_3.json b/res/trainers/data/cyclist_john_rematch_3.json index 109b90a08f..fba944cad2 100644 --- a/res/trainers/data/cyclist_john_rematch_3.json +++ b/res/trainers/data/cyclist_john_rematch_3.json @@ -13,7 +13,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_kayla.json b/res/trainers/data/cyclist_kayla.json index 4cad512423..83beb6abfd 100644 --- a/res/trainers/data/cyclist_kayla.json +++ b/res/trainers/data/cyclist_kayla.json @@ -13,7 +13,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_kayla_rematch_1.json b/res/trainers/data/cyclist_kayla_rematch_1.json index 97d9bc68e4..a50ddc1760 100644 --- a/res/trainers/data/cyclist_kayla_rematch_1.json +++ b/res/trainers/data/cyclist_kayla_rematch_1.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_kayla_rematch_2.json b/res/trainers/data/cyclist_kayla_rematch_2.json index c43c478ebb..bd2ac9df9b 100644 --- a/res/trainers/data/cyclist_kayla_rematch_2.json +++ b/res/trainers/data/cyclist_kayla_rematch_2.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_kayla_rematch_3.json b/res/trainers/data/cyclist_kayla_rematch_3.json index 1d9e4a44b7..e66064d4ca 100644 --- a/res/trainers/data/cyclist_kayla_rematch_3.json +++ b/res/trainers/data/cyclist_kayla_rematch_3.json @@ -13,7 +13,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_megan.json b/res/trainers/data/cyclist_megan.json index 2ba3b6911e..f17ff914e6 100644 --- a/res/trainers/data/cyclist_megan.json +++ b/res/trainers/data/cyclist_megan.json @@ -13,7 +13,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_nicole.json b/res/trainers/data/cyclist_nicole.json index 369f7aed49..aec42a8a17 100644 --- a/res/trainers/data/cyclist_nicole.json +++ b/res/trainers/data/cyclist_nicole.json @@ -13,7 +13,7 @@ "level": 17, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_rachel.json b/res/trainers/data/cyclist_rachel.json index 0eead1345f..0fd2c9cde8 100644 --- a/res/trainers/data/cyclist_rachel.json +++ b/res/trainers/data/cyclist_rachel.json @@ -13,7 +13,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/cyclist_ryan.json b/res/trainers/data/cyclist_ryan.json index 631fb54831..5b6b9e9291 100644 --- a/res/trainers/data/cyclist_ryan.json +++ b/res/trainers/data/cyclist_ryan.json @@ -13,7 +13,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dawn_jubilife_city_chimchar.json b/res/trainers/data/dawn_jubilife_city_chimchar.json index b8adb6a5d9..a5b436cfbc 100644 --- a/res/trainers/data/dawn_jubilife_city_chimchar.json +++ b/res/trainers/data/dawn_jubilife_city_chimchar.json @@ -20,7 +20,7 @@ "MOVE_ABSORB", "MOVE_TACKLE" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/dawn_jubilife_city_piplup.json b/res/trainers/data/dawn_jubilife_city_piplup.json index c2c4df3428..254670814b 100644 --- a/res/trainers/data/dawn_jubilife_city_piplup.json +++ b/res/trainers/data/dawn_jubilife_city_piplup.json @@ -20,7 +20,7 @@ "MOVE_EMBER", "MOVE_SCRATCH" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/dawn_jubilife_city_turtwig.json b/res/trainers/data/dawn_jubilife_city_turtwig.json index de78f9e41e..810eddb258 100644 --- a/res/trainers/data/dawn_jubilife_city_turtwig.json +++ b/res/trainers/data/dawn_jubilife_city_turtwig.json @@ -20,7 +20,7 @@ "MOVE_BUBBLE", "MOVE_POUND" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/dawn_veilstone_city_chimchar.json b/res/trainers/data/dawn_veilstone_city_chimchar.json index 9b38ea1e9e..4539db0958 100644 --- a/res/trainers/data/dawn_veilstone_city_chimchar.json +++ b/res/trainers/data/dawn_veilstone_city_chimchar.json @@ -20,7 +20,7 @@ "MOVE_WAKE_UP_SLAP", "MOVE_SING" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_BITE", "MOVE_CURSE" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/dawn_veilstone_city_piplup.json b/res/trainers/data/dawn_veilstone_city_piplup.json index 1c5059740b..41b7c74d14 100644 --- a/res/trainers/data/dawn_veilstone_city_piplup.json +++ b/res/trainers/data/dawn_veilstone_city_piplup.json @@ -20,7 +20,7 @@ "MOVE_WAKE_UP_SLAP", "MOVE_SING" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_FURY_SWIPES", "MOVE_TORMENT" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/dawn_veilstone_city_turtwig.json b/res/trainers/data/dawn_veilstone_city_turtwig.json index 5f610f19cb..83bec48b58 100644 --- a/res/trainers/data/dawn_veilstone_city_turtwig.json +++ b/res/trainers/data/dawn_veilstone_city_turtwig.json @@ -20,7 +20,7 @@ "MOVE_WAKE_UP_SLAP", "MOVE_SING" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_PECK", "MOVE_GROWL" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/double_team_al_and_kay.json b/res/trainers/data/double_team_al_and_kay.json index fa815f6dc5..90a475ade3 100644 --- a/res/trainers/data/double_team_al_and_kay.json +++ b/res/trainers/data/double_team_al_and_kay.json @@ -18,7 +18,7 @@ "MOVE_GROWL", "MOVE_QUICK_ATTACK" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_SHOCK_WAVE", "MOVE_WATER_PULSE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/double_team_jo_and_pat.json b/res/trainers/data/double_team_jo_and_pat.json index 634c127596..dcc9cf3312 100644 --- a/res/trainers/data/double_team_jo_and_pat.json +++ b/res/trainers/data/double_team_jo_and_pat.json @@ -18,7 +18,7 @@ "MOVE_CAPTIVATE", "MOVE_SILVER_WIND" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_QUICK_ATTACK", "MOVE_IRON_TAIL" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/double_team_zac_and_jen.json b/res/trainers/data/double_team_zac_and_jen.json index 453b54ae40..98845c16a0 100644 --- a/res/trainers/data/double_team_zac_and_jen.json +++ b/res/trainers/data/double_team_zac_and_jen.json @@ -13,7 +13,7 @@ "level": 36, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 36, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_clinton.json b/res/trainers/data/dragon_tamer_clinton.json index 93f6b1282c..a0d4041281 100644 --- a/res/trainers/data/dragon_tamer_clinton.json +++ b/res/trainers/data/dragon_tamer_clinton.json @@ -15,7 +15,7 @@ "level": 43, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 45, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 47, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_darien.json b/res/trainers/data/dragon_tamer_darien.json index 8aa919a207..c5563cd98f 100644 --- a/res/trainers/data/dragon_tamer_darien.json +++ b/res/trainers/data/dragon_tamer_darien.json @@ -15,7 +15,7 @@ "level": 60, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_drake.json b/res/trainers/data/dragon_tamer_drake.json index 31525ec869..3a90d3f9d9 100644 --- a/res/trainers/data/dragon_tamer_drake.json +++ b/res/trainers/data/dragon_tamer_drake.json @@ -15,7 +15,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_geoffrey.json b/res/trainers/data/dragon_tamer_geoffrey.json index 44456fa264..c4b823d6a9 100644 --- a/res/trainers/data/dragon_tamer_geoffrey.json +++ b/res/trainers/data/dragon_tamer_geoffrey.json @@ -15,7 +15,7 @@ "level": 53, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_geoffrey_rematch.json b/res/trainers/data/dragon_tamer_geoffrey_rematch.json index 499165caae..78d7c218d5 100644 --- a/res/trainers/data/dragon_tamer_geoffrey_rematch.json +++ b/res/trainers/data/dragon_tamer_geoffrey_rematch.json @@ -15,7 +15,7 @@ "level": 59, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 61, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_hayden.json b/res/trainers/data/dragon_tamer_hayden.json index 67ecf5ce15..ab137d607d 100644 --- a/res/trainers/data/dragon_tamer_hayden.json +++ b/res/trainers/data/dragon_tamer_hayden.json @@ -15,7 +15,7 @@ "level": 56, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 56, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_hayden_rematch.json b/res/trainers/data/dragon_tamer_hayden_rematch.json index 92d4c91b46..d9951504fb 100644 --- a/res/trainers/data/dragon_tamer_hayden_rematch.json +++ b/res/trainers/data/dragon_tamer_hayden_rematch.json @@ -15,7 +15,7 @@ "level": 60, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 60, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_joe.json b/res/trainers/data/dragon_tamer_joe.json index 19dcdc049e..e4b19c088b 100644 --- a/res/trainers/data/dragon_tamer_joe.json +++ b/res/trainers/data/dragon_tamer_joe.json @@ -15,7 +15,7 @@ "level": 52, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 56, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_keegan.json b/res/trainers/data/dragon_tamer_keegan.json index 195ad90069..9cc5503c90 100644 --- a/res/trainers/data/dragon_tamer_keegan.json +++ b/res/trainers/data/dragon_tamer_keegan.json @@ -15,7 +15,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_kenny.json b/res/trainers/data/dragon_tamer_kenny.json index f37afb5e7b..6d9cd40187 100644 --- a/res/trainers/data/dragon_tamer_kenny.json +++ b/res/trainers/data/dragon_tamer_kenny.json @@ -15,7 +15,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_ondrej.json b/res/trainers/data/dragon_tamer_ondrej.json index 48a255b1c9..ae77b9766d 100644 --- a/res/trainers/data/dragon_tamer_ondrej.json +++ b/res/trainers/data/dragon_tamer_ondrej.json @@ -15,7 +15,7 @@ "level": 45, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 47, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_patrick.json b/res/trainers/data/dragon_tamer_patrick.json index 6e62c2e96a..10cf59467a 100644 --- a/res/trainers/data/dragon_tamer_patrick.json +++ b/res/trainers/data/dragon_tamer_patrick.json @@ -15,7 +15,7 @@ "level": 34, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 17 } ], diff --git a/res/trainers/data/dragon_tamer_patrick_rematch_1.json b/res/trainers/data/dragon_tamer_patrick_rematch_1.json index b017bac7fd..35b527077d 100644 --- a/res/trainers/data/dragon_tamer_patrick_rematch_1.json +++ b/res/trainers/data/dragon_tamer_patrick_rematch_1.json @@ -15,7 +15,7 @@ "level": 46, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 17 } ], diff --git a/res/trainers/data/dragon_tamer_patrick_rematch_2.json b/res/trainers/data/dragon_tamer_patrick_rematch_2.json index e8634c0091..6773dc1487 100644 --- a/res/trainers/data/dragon_tamer_patrick_rematch_2.json +++ b/res/trainers/data/dragon_tamer_patrick_rematch_2.json @@ -15,7 +15,7 @@ "level": 61, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 17 }, { @@ -24,7 +24,7 @@ "level": 61, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 61, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dragon_tamer_stanley.json b/res/trainers/data/dragon_tamer_stanley.json index e58fb631a3..5c60ea0943 100644 --- a/res/trainers/data/dragon_tamer_stanley.json +++ b/res/trainers/data/dragon_tamer_stanley.json @@ -15,7 +15,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_005.json b/res/trainers/data/dummy_005.json index 7f281384b1..a1a2a5a17d 100644 --- a/res/trainers/data/dummy_005.json +++ b/res/trainers/data/dummy_005.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_006.json b/res/trainers/data/dummy_006.json index 7f281384b1..a1a2a5a17d 100644 --- a/res/trainers/data/dummy_006.json +++ b/res/trainers/data/dummy_006.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_007.json b/res/trainers/data/dummy_007.json index a9b306cb1c..e820a13edc 100644 --- a/res/trainers/data/dummy_007.json +++ b/res/trainers/data/dummy_007.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_008.json b/res/trainers/data/dummy_008.json index a9b306cb1c..e820a13edc 100644 --- a/res/trainers/data/dummy_008.json +++ b/res/trainers/data/dummy_008.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_009.json b/res/trainers/data/dummy_009.json index cb48dcf18a..e726ea2f88 100644 --- a/res/trainers/data/dummy_009.json +++ b/res/trainers/data/dummy_009.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_050.json b/res/trainers/data/dummy_050.json index db18a7052a..78896cf590 100644 --- a/res/trainers/data/dummy_050.json +++ b/res/trainers/data/dummy_050.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_051.json b/res/trainers/data/dummy_051.json index 36830721b6..d95810bfdc 100644 --- a/res/trainers/data/dummy_051.json +++ b/res/trainers/data/dummy_051.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_052.json b/res/trainers/data/dummy_052.json index 02989f67d0..c0776bc27d 100644 --- a/res/trainers/data/dummy_052.json +++ b/res/trainers/data/dummy_052.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_054.json b/res/trainers/data/dummy_054.json index 099b15249f..20dcb3e26c 100644 --- a/res/trainers/data/dummy_054.json +++ b/res/trainers/data/dummy_054.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_058.json b/res/trainers/data/dummy_058.json index 3a0522d524..4918452c2b 100644 --- a/res/trainers/data/dummy_058.json +++ b/res/trainers/data/dummy_058.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_058_rematch_1.json b/res/trainers/data/dummy_058_rematch_1.json index 2b5ab5b554..f52311f5fb 100644 --- a/res/trainers/data/dummy_058_rematch_1.json +++ b/res/trainers/data/dummy_058_rematch_1.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_058_rematch_2.json b/res/trainers/data/dummy_058_rematch_2.json index 2b5ab5b554..f52311f5fb 100644 --- a/res/trainers/data/dummy_058_rematch_2.json +++ b/res/trainers/data/dummy_058_rematch_2.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_059.json b/res/trainers/data/dummy_059.json index 7a52740ada..8b5a9d1a12 100644 --- a/res/trainers/data/dummy_059.json +++ b/res/trainers/data/dummy_059.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_060.json b/res/trainers/data/dummy_060.json index d487fc1088..0cf44c2b12 100644 --- a/res/trainers/data/dummy_060.json +++ b/res/trainers/data/dummy_060.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_061.json b/res/trainers/data/dummy_061.json index 6785c70b91..e7208b00eb 100644 --- a/res/trainers/data/dummy_061.json +++ b/res/trainers/data/dummy_061.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_062.json b/res/trainers/data/dummy_062.json index ed4251e2e3..fe5f6fe0cd 100644 --- a/res/trainers/data/dummy_062.json +++ b/res/trainers/data/dummy_062.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_063.json b/res/trainers/data/dummy_063.json index a9b283f361..ce331bc6d3 100644 --- a/res/trainers/data/dummy_063.json +++ b/res/trainers/data/dummy_063.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_064.json b/res/trainers/data/dummy_064.json index 3b81d75ea7..9c810c8757 100644 --- a/res/trainers/data/dummy_064.json +++ b/res/trainers/data/dummy_064.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_077.json b/res/trainers/data/dummy_077.json index 373a96f28f..49e1ee7b3a 100644 --- a/res/trainers/data/dummy_077.json +++ b/res/trainers/data/dummy_077.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_086.json b/res/trainers/data/dummy_086.json index 24f0f49053..ae876e18f6 100644 --- a/res/trainers/data/dummy_086.json +++ b/res/trainers/data/dummy_086.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_087.json b/res/trainers/data/dummy_087.json index 12237074f4..94d6426da2 100644 --- a/res/trainers/data/dummy_087.json +++ b/res/trainers/data/dummy_087.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_097.json b/res/trainers/data/dummy_097.json index b1906f5749..669443dbe7 100644 --- a/res/trainers/data/dummy_097.json +++ b/res/trainers/data/dummy_097.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_098.json b/res/trainers/data/dummy_098.json index 52dfcbdf52..22259a046b 100644 --- a/res/trainers/data/dummy_098.json +++ b/res/trainers/data/dummy_098.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_100.json b/res/trainers/data/dummy_100.json index 97311a54bc..e563616265 100644 --- a/res/trainers/data/dummy_100.json +++ b/res/trainers/data/dummy_100.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_101.json b/res/trainers/data/dummy_101.json index 1644211fe5..fbad11ea88 100644 --- a/res/trainers/data/dummy_101.json +++ b/res/trainers/data/dummy_101.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_109.json b/res/trainers/data/dummy_109.json index c7f96207bd..5a69395d3d 100644 --- a/res/trainers/data/dummy_109.json +++ b/res/trainers/data/dummy_109.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_112.json b/res/trainers/data/dummy_112.json index 98cd1b31a8..20e12e2d24 100644 --- a/res/trainers/data/dummy_112.json +++ b/res/trainers/data/dummy_112.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_115.json b/res/trainers/data/dummy_115.json index 4b0c050845..dadb674f48 100644 --- a/res/trainers/data/dummy_115.json +++ b/res/trainers/data/dummy_115.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_116.json b/res/trainers/data/dummy_116.json index 0c505ec6d0..106fb86542 100644 --- a/res/trainers/data/dummy_116.json +++ b/res/trainers/data/dummy_116.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_117.json b/res/trainers/data/dummy_117.json index b5bf3173cc..63e44a65d3 100644 --- a/res/trainers/data/dummy_117.json +++ b/res/trainers/data/dummy_117.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_118.json b/res/trainers/data/dummy_118.json index a93e39600f..2664a1d433 100644 --- a/res/trainers/data/dummy_118.json +++ b/res/trainers/data/dummy_118.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_122.json b/res/trainers/data/dummy_122.json index 4ce2dd13cf..4f85469150 100644 --- a/res/trainers/data/dummy_122.json +++ b/res/trainers/data/dummy_122.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_123.json b/res/trainers/data/dummy_123.json index 52e1c1b401..d7c2d9d057 100644 --- a/res/trainers/data/dummy_123.json +++ b/res/trainers/data/dummy_123.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_124.json b/res/trainers/data/dummy_124.json index 5d0b4e5942..1664456b5a 100644 --- a/res/trainers/data/dummy_124.json +++ b/res/trainers/data/dummy_124.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_125.json b/res/trainers/data/dummy_125.json index 03d9f58215..255ef8cdd7 100644 --- a/res/trainers/data/dummy_125.json +++ b/res/trainers/data/dummy_125.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_126.json b/res/trainers/data/dummy_126.json index 292b63a5e1..efdc00a341 100644 --- a/res/trainers/data/dummy_126.json +++ b/res/trainers/data/dummy_126.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_131.json b/res/trainers/data/dummy_131.json index d7c237e228..8ca9315048 100644 --- a/res/trainers/data/dummy_131.json +++ b/res/trainers/data/dummy_131.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_149.json b/res/trainers/data/dummy_149.json index 195af8e8e9..e4307899b1 100644 --- a/res/trainers/data/dummy_149.json +++ b/res/trainers/data/dummy_149.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_150.json b/res/trainers/data/dummy_150.json index 14e548ff8b..708af98b0f 100644 --- a/res/trainers/data/dummy_150.json +++ b/res/trainers/data/dummy_150.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_151.json b/res/trainers/data/dummy_151.json index 15ed79c96d..d322016a20 100644 --- a/res/trainers/data/dummy_151.json +++ b/res/trainers/data/dummy_151.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_152.json b/res/trainers/data/dummy_152.json index d6608fc68d..9d2b699b97 100644 --- a/res/trainers/data/dummy_152.json +++ b/res/trainers/data/dummy_152.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_155.json b/res/trainers/data/dummy_155.json index fb798384dd..0ebcf1c481 100644 --- a/res/trainers/data/dummy_155.json +++ b/res/trainers/data/dummy_155.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_156.json b/res/trainers/data/dummy_156.json index 246bba7497..555d418efe 100644 --- a/res/trainers/data/dummy_156.json +++ b/res/trainers/data/dummy_156.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_157.json b/res/trainers/data/dummy_157.json index 94809b7d81..af663f641c 100644 --- a/res/trainers/data/dummy_157.json +++ b/res/trainers/data/dummy_157.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_158.json b/res/trainers/data/dummy_158.json index ca19dc14ba..eeb2d6d4c0 100644 --- a/res/trainers/data/dummy_158.json +++ b/res/trainers/data/dummy_158.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_165.json b/res/trainers/data/dummy_165.json index ddcd1ba871..8c9b58d1a7 100644 --- a/res/trainers/data/dummy_165.json +++ b/res/trainers/data/dummy_165.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_169.json b/res/trainers/data/dummy_169.json index 8e100b2271..cd2ad2940f 100644 --- a/res/trainers/data/dummy_169.json +++ b/res/trainers/data/dummy_169.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_176.json b/res/trainers/data/dummy_176.json index 4357877a47..565fc1c8d2 100644 --- a/res/trainers/data/dummy_176.json +++ b/res/trainers/data/dummy_176.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_177.json b/res/trainers/data/dummy_177.json index c22b820806..73d386eef9 100644 --- a/res/trainers/data/dummy_177.json +++ b/res/trainers/data/dummy_177.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_178.json b/res/trainers/data/dummy_178.json index c056bc5283..be15ec3d12 100644 --- a/res/trainers/data/dummy_178.json +++ b/res/trainers/data/dummy_178.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_179.json b/res/trainers/data/dummy_179.json index 8fb348853c..259b0df2fb 100644 --- a/res/trainers/data/dummy_179.json +++ b/res/trainers/data/dummy_179.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_181.json b/res/trainers/data/dummy_181.json index 396b7b1ad1..111a274b32 100644 --- a/res/trainers/data/dummy_181.json +++ b/res/trainers/data/dummy_181.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_182.json b/res/trainers/data/dummy_182.json index 84aab713cf..0078174d99 100644 --- a/res/trainers/data/dummy_182.json +++ b/res/trainers/data/dummy_182.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_197.json b/res/trainers/data/dummy_197.json index 23f544a10f..5d436a4949 100644 --- a/res/trainers/data/dummy_197.json +++ b/res/trainers/data/dummy_197.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_198.json b/res/trainers/data/dummy_198.json index f8be0d5d00..86551a90a2 100644 --- a/res/trainers/data/dummy_198.json +++ b/res/trainers/data/dummy_198.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_199.json b/res/trainers/data/dummy_199.json index 0a715b0e95..9fe5abda41 100644 --- a/res/trainers/data/dummy_199.json +++ b/res/trainers/data/dummy_199.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_200.json b/res/trainers/data/dummy_200.json index ecb5e417b1..03b2c00fd7 100644 --- a/res/trainers/data/dummy_200.json +++ b/res/trainers/data/dummy_200.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_207.json b/res/trainers/data/dummy_207.json index c2dc986364..92eea2fd99 100644 --- a/res/trainers/data/dummy_207.json +++ b/res/trainers/data/dummy_207.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_208.json b/res/trainers/data/dummy_208.json index 02e072e301..3f830c25fd 100644 --- a/res/trainers/data/dummy_208.json +++ b/res/trainers/data/dummy_208.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_209.json b/res/trainers/data/dummy_209.json index 402fd2d238..8fcb55006f 100644 --- a/res/trainers/data/dummy_209.json +++ b/res/trainers/data/dummy_209.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_210.json b/res/trainers/data/dummy_210.json index f4f41f6ce8..d3ce30052f 100644 --- a/res/trainers/data/dummy_210.json +++ b/res/trainers/data/dummy_210.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_211.json b/res/trainers/data/dummy_211.json index a3531acac5..456a4c28e6 100644 --- a/res/trainers/data/dummy_211.json +++ b/res/trainers/data/dummy_211.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_212.json b/res/trainers/data/dummy_212.json index e6678e3c60..ad252cf8b1 100644 --- a/res/trainers/data/dummy_212.json +++ b/res/trainers/data/dummy_212.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_213.json b/res/trainers/data/dummy_213.json index 7ae7c18674..f44e8b5d04 100644 --- a/res/trainers/data/dummy_213.json +++ b/res/trainers/data/dummy_213.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_214.json b/res/trainers/data/dummy_214.json index 71a89b2d24..7102eb31c8 100644 --- a/res/trainers/data/dummy_214.json +++ b/res/trainers/data/dummy_214.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_215.json b/res/trainers/data/dummy_215.json index 9791831324..718561e1cf 100644 --- a/res/trainers/data/dummy_215.json +++ b/res/trainers/data/dummy_215.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_216.json b/res/trainers/data/dummy_216.json index 30d9df99a9..af82285dcf 100644 --- a/res/trainers/data/dummy_216.json +++ b/res/trainers/data/dummy_216.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_217.json b/res/trainers/data/dummy_217.json index 9bc344f904..4c4d4a241b 100644 --- a/res/trainers/data/dummy_217.json +++ b/res/trainers/data/dummy_217.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_218.json b/res/trainers/data/dummy_218.json index 4879ce1625..c262a2d821 100644 --- a/res/trainers/data/dummy_218.json +++ b/res/trainers/data/dummy_218.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_219.json b/res/trainers/data/dummy_219.json index 1396e34449..6fa20ea59b 100644 --- a/res/trainers/data/dummy_219.json +++ b/res/trainers/data/dummy_219.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_220.json b/res/trainers/data/dummy_220.json index 9e61692acd..80a1c8b14a 100644 --- a/res/trainers/data/dummy_220.json +++ b/res/trainers/data/dummy_220.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_221.json b/res/trainers/data/dummy_221.json index 34f15853c5..dd7ddb9e62 100644 --- a/res/trainers/data/dummy_221.json +++ b/res/trainers/data/dummy_221.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_222.json b/res/trainers/data/dummy_222.json index 271185ca67..83390d0cbf 100644 --- a/res/trainers/data/dummy_222.json +++ b/res/trainers/data/dummy_222.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_223.json b/res/trainers/data/dummy_223.json index 83a49d6120..75fbcc9754 100644 --- a/res/trainers/data/dummy_223.json +++ b/res/trainers/data/dummy_223.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_238.json b/res/trainers/data/dummy_238.json index cb48dcf18a..e726ea2f88 100644 --- a/res/trainers/data/dummy_238.json +++ b/res/trainers/data/dummy_238.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_239.json b/res/trainers/data/dummy_239.json index 0f83fb9ae1..700ae68402 100644 --- a/res/trainers/data/dummy_239.json +++ b/res/trainers/data/dummy_239.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_241.json b/res/trainers/data/dummy_241.json index 7590ec2244..ec479b3c22 100644 --- a/res/trainers/data/dummy_241.json +++ b/res/trainers/data/dummy_241.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_242.json b/res/trainers/data/dummy_242.json index 55f254545d..7c50fc78d3 100644 --- a/res/trainers/data/dummy_242.json +++ b/res/trainers/data/dummy_242.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_243.json b/res/trainers/data/dummy_243.json index 29613c8a1e..5d0a65e184 100644 --- a/res/trainers/data/dummy_243.json +++ b/res/trainers/data/dummy_243.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_251.json b/res/trainers/data/dummy_251.json index 8cadb3182a..e365add428 100644 --- a/res/trainers/data/dummy_251.json +++ b/res/trainers/data/dummy_251.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_252.json b/res/trainers/data/dummy_252.json index 7f281384b1..a1a2a5a17d 100644 --- a/res/trainers/data/dummy_252.json +++ b/res/trainers/data/dummy_252.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_253.json b/res/trainers/data/dummy_253.json index 7f281384b1..a1a2a5a17d 100644 --- a/res/trainers/data/dummy_253.json +++ b/res/trainers/data/dummy_253.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_254.json b/res/trainers/data/dummy_254.json index 7f281384b1..a1a2a5a17d 100644 --- a/res/trainers/data/dummy_254.json +++ b/res/trainers/data/dummy_254.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_255.json b/res/trainers/data/dummy_255.json index 7f281384b1..a1a2a5a17d 100644 --- a/res/trainers/data/dummy_255.json +++ b/res/trainers/data/dummy_255.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_291.json b/res/trainers/data/dummy_291.json index 5e7ed28f0b..98583c184d 100644 --- a/res/trainers/data/dummy_291.json +++ b/res/trainers/data/dummy_291.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_321.json b/res/trainers/data/dummy_321.json index 0f83fb9ae1..700ae68402 100644 --- a/res/trainers/data/dummy_321.json +++ b/res/trainers/data/dummy_321.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_334.json b/res/trainers/data/dummy_334.json index 8918439aaf..43a6e3ab83 100644 --- a/res/trainers/data/dummy_334.json +++ b/res/trainers/data/dummy_334.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_336.json b/res/trainers/data/dummy_336.json index 7d442c12a5..cfd86419bb 100644 --- a/res/trainers/data/dummy_336.json +++ b/res/trainers/data/dummy_336.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_347.json b/res/trainers/data/dummy_347.json index df59acdaf1..8dc2057ae1 100644 --- a/res/trainers/data/dummy_347.json +++ b/res/trainers/data/dummy_347.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_349.json b/res/trainers/data/dummy_349.json index 64d9911f77..fd09c355f7 100644 --- a/res/trainers/data/dummy_349.json +++ b/res/trainers/data/dummy_349.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_350.json b/res/trainers/data/dummy_350.json index bc86cef428..e3d1cc505a 100644 --- a/res/trainers/data/dummy_350.json +++ b/res/trainers/data/dummy_350.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_351.json b/res/trainers/data/dummy_351.json index 00a594c873..10db08cece 100644 --- a/res/trainers/data/dummy_351.json +++ b/res/trainers/data/dummy_351.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_352.json b/res/trainers/data/dummy_352.json index 54c7e954a9..6a55cd0da9 100644 --- a/res/trainers/data/dummy_352.json +++ b/res/trainers/data/dummy_352.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_353.json b/res/trainers/data/dummy_353.json index fe806fc291..babb703e70 100644 --- a/res/trainers/data/dummy_353.json +++ b/res/trainers/data/dummy_353.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_354.json b/res/trainers/data/dummy_354.json index 4a595ebcae..a3d2fe7c48 100644 --- a/res/trainers/data/dummy_354.json +++ b/res/trainers/data/dummy_354.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_363.json b/res/trainers/data/dummy_363.json index c66718ee6f..f5baa1c773 100644 --- a/res/trainers/data/dummy_363.json +++ b/res/trainers/data/dummy_363.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_364.json b/res/trainers/data/dummy_364.json index 55fc5e3684..2716a297cd 100644 --- a/res/trainers/data/dummy_364.json +++ b/res/trainers/data/dummy_364.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_365.json b/res/trainers/data/dummy_365.json index 82af9627ff..85933142ab 100644 --- a/res/trainers/data/dummy_365.json +++ b/res/trainers/data/dummy_365.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_374.json b/res/trainers/data/dummy_374.json index 5f683a1af7..d5d6ed0706 100644 --- a/res/trainers/data/dummy_374.json +++ b/res/trainers/data/dummy_374.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_375.json b/res/trainers/data/dummy_375.json index 64ec85d0ad..e582c3168a 100644 --- a/res/trainers/data/dummy_375.json +++ b/res/trainers/data/dummy_375.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_376.json b/res/trainers/data/dummy_376.json index b548776e85..09fc8847ca 100644 --- a/res/trainers/data/dummy_376.json +++ b/res/trainers/data/dummy_376.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_384.json b/res/trainers/data/dummy_384.json index 321efff6b3..433320fec0 100644 --- a/res/trainers/data/dummy_384.json +++ b/res/trainers/data/dummy_384.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_385.json b/res/trainers/data/dummy_385.json index b3b536683e..bb1a8d397d 100644 --- a/res/trainers/data/dummy_385.json +++ b/res/trainers/data/dummy_385.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_387.json b/res/trainers/data/dummy_387.json index 41dbd5b8fa..931c29571e 100644 --- a/res/trainers/data/dummy_387.json +++ b/res/trainers/data/dummy_387.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_391.json b/res/trainers/data/dummy_391.json index 8cadb3182a..e365add428 100644 --- a/res/trainers/data/dummy_391.json +++ b/res/trainers/data/dummy_391.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_402.json b/res/trainers/data/dummy_402.json index 40efe3eb74..0edcfe05db 100644 --- a/res/trainers/data/dummy_402.json +++ b/res/trainers/data/dummy_402.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_411.json b/res/trainers/data/dummy_411.json index 0270acfe49..e0bd149308 100644 --- a/res/trainers/data/dummy_411.json +++ b/res/trainers/data/dummy_411.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_413.json b/res/trainers/data/dummy_413.json index 71cb40a500..f999e5bd54 100644 --- a/res/trainers/data/dummy_413.json +++ b/res/trainers/data/dummy_413.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_424.json b/res/trainers/data/dummy_424.json index 92fd495b6d..f3d8458b9d 100644 --- a/res/trainers/data/dummy_424.json +++ b/res/trainers/data/dummy_424.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_429.json b/res/trainers/data/dummy_429.json index a2a1971cfc..4057d3b936 100644 --- a/res/trainers/data/dummy_429.json +++ b/res/trainers/data/dummy_429.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_432.json b/res/trainers/data/dummy_432.json index 2b4b151b17..dceb24724d 100644 --- a/res/trainers/data/dummy_432.json +++ b/res/trainers/data/dummy_432.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_433.json b/res/trainers/data/dummy_433.json index d505cffef9..3daa60ffb6 100644 --- a/res/trainers/data/dummy_433.json +++ b/res/trainers/data/dummy_433.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_434.json b/res/trainers/data/dummy_434.json index bccbd74f14..21db3ae4b4 100644 --- a/res/trainers/data/dummy_434.json +++ b/res/trainers/data/dummy_434.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_435.json b/res/trainers/data/dummy_435.json index 9e58327b51..dcbb8cdb05 100644 --- a/res/trainers/data/dummy_435.json +++ b/res/trainers/data/dummy_435.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_436.json b/res/trainers/data/dummy_436.json index 0637d031ea..8ef7bf7838 100644 --- a/res/trainers/data/dummy_436.json +++ b/res/trainers/data/dummy_436.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_437.json b/res/trainers/data/dummy_437.json index 520204fda2..cccf28cbc2 100644 --- a/res/trainers/data/dummy_437.json +++ b/res/trainers/data/dummy_437.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_438.json b/res/trainers/data/dummy_438.json index 520204fda2..cccf28cbc2 100644 --- a/res/trainers/data/dummy_438.json +++ b/res/trainers/data/dummy_438.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_439.json b/res/trainers/data/dummy_439.json index 8e632ea03c..ff011aeeb2 100644 --- a/res/trainers/data/dummy_439.json +++ b/res/trainers/data/dummy_439.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_440.json b/res/trainers/data/dummy_440.json index 8e632ea03c..ff011aeeb2 100644 --- a/res/trainers/data/dummy_440.json +++ b/res/trainers/data/dummy_440.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_441.json b/res/trainers/data/dummy_441.json index 5528c9e8b9..4d0d6d96bc 100644 --- a/res/trainers/data/dummy_441.json +++ b/res/trainers/data/dummy_441.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_448.json b/res/trainers/data/dummy_448.json index 9035565e71..c4eae647ba 100644 --- a/res/trainers/data/dummy_448.json +++ b/res/trainers/data/dummy_448.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_449.json b/res/trainers/data/dummy_449.json index 0f83fb9ae1..700ae68402 100644 --- a/res/trainers/data/dummy_449.json +++ b/res/trainers/data/dummy_449.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_461.json b/res/trainers/data/dummy_461.json index c5d665c1aa..5cf35497e4 100644 --- a/res/trainers/data/dummy_461.json +++ b/res/trainers/data/dummy_461.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_462.json b/res/trainers/data/dummy_462.json index c5d665c1aa..5cf35497e4 100644 --- a/res/trainers/data/dummy_462.json +++ b/res/trainers/data/dummy_462.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_463.json b/res/trainers/data/dummy_463.json index c5d665c1aa..5cf35497e4 100644 --- a/res/trainers/data/dummy_463.json +++ b/res/trainers/data/dummy_463.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_464.json b/res/trainers/data/dummy_464.json index c5d665c1aa..5cf35497e4 100644 --- a/res/trainers/data/dummy_464.json +++ b/res/trainers/data/dummy_464.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_466.json b/res/trainers/data/dummy_466.json index 7fd6b612a3..db316a6a17 100644 --- a/res/trainers/data/dummy_466.json +++ b/res/trainers/data/dummy_466.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_467.json b/res/trainers/data/dummy_467.json index 7d4fdc16b0..60b12c8f73 100644 --- a/res/trainers/data/dummy_467.json +++ b/res/trainers/data/dummy_467.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_468.json b/res/trainers/data/dummy_468.json index 84b04102fc..1d5803ec8d 100644 --- a/res/trainers/data/dummy_468.json +++ b/res/trainers/data/dummy_468.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_469.json b/res/trainers/data/dummy_469.json index f504ffe85f..112eb74a70 100644 --- a/res/trainers/data/dummy_469.json +++ b/res/trainers/data/dummy_469.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_484.json b/res/trainers/data/dummy_484.json index e9022ca53b..576c7724c9 100644 --- a/res/trainers/data/dummy_484.json +++ b/res/trainers/data/dummy_484.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_485.json b/res/trainers/data/dummy_485.json index df20e519b3..a9d68a952c 100644 --- a/res/trainers/data/dummy_485.json +++ b/res/trainers/data/dummy_485.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_487.json b/res/trainers/data/dummy_487.json index b93af95d35..da24b59a50 100644 --- a/res/trainers/data/dummy_487.json +++ b/res/trainers/data/dummy_487.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_493.json b/res/trainers/data/dummy_493.json index ccbf9eae61..d24d2d41af 100644 --- a/res/trainers/data/dummy_493.json +++ b/res/trainers/data/dummy_493.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_495.json b/res/trainers/data/dummy_495.json index cb48dcf18a..e726ea2f88 100644 --- a/res/trainers/data/dummy_495.json +++ b/res/trainers/data/dummy_495.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_501.json b/res/trainers/data/dummy_501.json index 65e661d582..91d198e4be 100644 --- a/res/trainers/data/dummy_501.json +++ b/res/trainers/data/dummy_501.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_502.json b/res/trainers/data/dummy_502.json index 73a3808462..22be6d0ddf 100644 --- a/res/trainers/data/dummy_502.json +++ b/res/trainers/data/dummy_502.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_511.json b/res/trainers/data/dummy_511.json index e87a32132e..2b2dec4435 100644 --- a/res/trainers/data/dummy_511.json +++ b/res/trainers/data/dummy_511.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_605.json b/res/trainers/data/dummy_605.json index 0fd81114f1..e5051564d1 100644 --- a/res/trainers/data/dummy_605.json +++ b/res/trainers/data/dummy_605.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_605_rematch.json b/res/trainers/data/dummy_605_rematch.json index a21ae25b32..61aaf79460 100644 --- a/res/trainers/data/dummy_605_rematch.json +++ b/res/trainers/data/dummy_605_rematch.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_779.json b/res/trainers/data/dummy_779.json index 6e212b0484..1e9521a47a 100644 --- a/res/trainers/data/dummy_779.json +++ b/res/trainers/data/dummy_779.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_780.json b/res/trainers/data/dummy_780.json index 6e212b0484..1e9521a47a 100644 --- a/res/trainers/data/dummy_780.json +++ b/res/trainers/data/dummy_780.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_781.json b/res/trainers/data/dummy_781.json index 6e212b0484..1e9521a47a 100644 --- a/res/trainers/data/dummy_781.json +++ b/res/trainers/data/dummy_781.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_782.json b/res/trainers/data/dummy_782.json index 6e212b0484..1e9521a47a 100644 --- a/res/trainers/data/dummy_782.json +++ b/res/trainers/data/dummy_782.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_783.json b/res/trainers/data/dummy_783.json index 6e212b0484..1e9521a47a 100644 --- a/res/trainers/data/dummy_783.json +++ b/res/trainers/data/dummy_783.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_784.json b/res/trainers/data/dummy_784.json index e54f366cca..f47babe38f 100644 --- a/res/trainers/data/dummy_784.json +++ b/res/trainers/data/dummy_784.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_785.json b/res/trainers/data/dummy_785.json index 3c5034f4e2..8e796fe8a5 100644 --- a/res/trainers/data/dummy_785.json +++ b/res/trainers/data/dummy_785.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_786.json b/res/trainers/data/dummy_786.json index 3c5034f4e2..8e796fe8a5 100644 --- a/res/trainers/data/dummy_786.json +++ b/res/trainers/data/dummy_786.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_787.json b/res/trainers/data/dummy_787.json index e54f366cca..f47babe38f 100644 --- a/res/trainers/data/dummy_787.json +++ b/res/trainers/data/dummy_787.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_788.json b/res/trainers/data/dummy_788.json index e54f366cca..f47babe38f 100644 --- a/res/trainers/data/dummy_788.json +++ b/res/trainers/data/dummy_788.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_789.json b/res/trainers/data/dummy_789.json index e54f366cca..f47babe38f 100644 --- a/res/trainers/data/dummy_789.json +++ b/res/trainers/data/dummy_789.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_790.json b/res/trainers/data/dummy_790.json index 0094f530ea..afbb9be55b 100644 --- a/res/trainers/data/dummy_790.json +++ b/res/trainers/data/dummy_790.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_791.json b/res/trainers/data/dummy_791.json index 0094f530ea..afbb9be55b 100644 --- a/res/trainers/data/dummy_791.json +++ b/res/trainers/data/dummy_791.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_792.json b/res/trainers/data/dummy_792.json index 0094f530ea..afbb9be55b 100644 --- a/res/trainers/data/dummy_792.json +++ b/res/trainers/data/dummy_792.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_793.json b/res/trainers/data/dummy_793.json index 0094f530ea..afbb9be55b 100644 --- a/res/trainers/data/dummy_793.json +++ b/res/trainers/data/dummy_793.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_794.json b/res/trainers/data/dummy_794.json index 0094f530ea..afbb9be55b 100644 --- a/res/trainers/data/dummy_794.json +++ b/res/trainers/data/dummy_794.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_795.json b/res/trainers/data/dummy_795.json index 2aefddea41..e2185244ca 100644 --- a/res/trainers/data/dummy_795.json +++ b/res/trainers/data/dummy_795.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_796.json b/res/trainers/data/dummy_796.json index 2aefddea41..e2185244ca 100644 --- a/res/trainers/data/dummy_796.json +++ b/res/trainers/data/dummy_796.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_797.json b/res/trainers/data/dummy_797.json index 2aefddea41..e2185244ca 100644 --- a/res/trainers/data/dummy_797.json +++ b/res/trainers/data/dummy_797.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_798.json b/res/trainers/data/dummy_798.json index 2aefddea41..e2185244ca 100644 --- a/res/trainers/data/dummy_798.json +++ b/res/trainers/data/dummy_798.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_799.json b/res/trainers/data/dummy_799.json index f32beb1bc2..a1deb9d6de 100644 --- a/res/trainers/data/dummy_799.json +++ b/res/trainers/data/dummy_799.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_800.json b/res/trainers/data/dummy_800.json index f32beb1bc2..a1deb9d6de 100644 --- a/res/trainers/data/dummy_800.json +++ b/res/trainers/data/dummy_800.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_801.json b/res/trainers/data/dummy_801.json index f32beb1bc2..a1deb9d6de 100644 --- a/res/trainers/data/dummy_801.json +++ b/res/trainers/data/dummy_801.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_802.json b/res/trainers/data/dummy_802.json index f32beb1bc2..a1deb9d6de 100644 --- a/res/trainers/data/dummy_802.json +++ b/res/trainers/data/dummy_802.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_803.json b/res/trainers/data/dummy_803.json index f32beb1bc2..a1deb9d6de 100644 --- a/res/trainers/data/dummy_803.json +++ b/res/trainers/data/dummy_803.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_804.json b/res/trainers/data/dummy_804.json index 1a6d83d730..0b796651fb 100644 --- a/res/trainers/data/dummy_804.json +++ b/res/trainers/data/dummy_804.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_805.json b/res/trainers/data/dummy_805.json index 1a6d83d730..0b796651fb 100644 --- a/res/trainers/data/dummy_805.json +++ b/res/trainers/data/dummy_805.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_806.json b/res/trainers/data/dummy_806.json index 1a6d83d730..0b796651fb 100644 --- a/res/trainers/data/dummy_806.json +++ b/res/trainers/data/dummy_806.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_807.json b/res/trainers/data/dummy_807.json index 1a6d83d730..0b796651fb 100644 --- a/res/trainers/data/dummy_807.json +++ b/res/trainers/data/dummy_807.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_808.json b/res/trainers/data/dummy_808.json index c2802306d3..09373550c3 100644 --- a/res/trainers/data/dummy_808.json +++ b/res/trainers/data/dummy_808.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_809.json b/res/trainers/data/dummy_809.json index 7aae3a9c04..dd27f23f18 100644 --- a/res/trainers/data/dummy_809.json +++ b/res/trainers/data/dummy_809.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_810.json b/res/trainers/data/dummy_810.json index 7aae3a9c04..dd27f23f18 100644 --- a/res/trainers/data/dummy_810.json +++ b/res/trainers/data/dummy_810.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_811.json b/res/trainers/data/dummy_811.json index 7aae3a9c04..dd27f23f18 100644 --- a/res/trainers/data/dummy_811.json +++ b/res/trainers/data/dummy_811.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_812.json b/res/trainers/data/dummy_812.json index 7aae3a9c04..dd27f23f18 100644 --- a/res/trainers/data/dummy_812.json +++ b/res/trainers/data/dummy_812.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_813.json b/res/trainers/data/dummy_813.json index 9c92da30d0..4ca8f1dce7 100644 --- a/res/trainers/data/dummy_813.json +++ b/res/trainers/data/dummy_813.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_814.json b/res/trainers/data/dummy_814.json index cfe2e5a915..77cf5cdbcc 100644 --- a/res/trainers/data/dummy_814.json +++ b/res/trainers/data/dummy_814.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_815.json b/res/trainers/data/dummy_815.json index 41e09cd076..174382a48f 100644 --- a/res/trainers/data/dummy_815.json +++ b/res/trainers/data/dummy_815.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_816.json b/res/trainers/data/dummy_816.json index d37bb17e30..c5c33a7fcf 100644 --- a/res/trainers/data/dummy_816.json +++ b/res/trainers/data/dummy_816.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_833.json b/res/trainers/data/dummy_833.json index cca47cdd7f..1ae2f28dd4 100644 --- a/res/trainers/data/dummy_833.json +++ b/res/trainers/data/dummy_833.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/dummy_834.json b/res/trainers/data/dummy_834.json index cca47cdd7f..1ae2f28dd4 100644 --- a/res/trainers/data/dummy_834.json +++ b/res/trainers/data/dummy_834.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/elite_four_aaron.json b/res/trainers/data/elite_four_aaron.json index 8431da195b..ee05e2b06e 100644 --- a/res/trainers/data/elite_four_aaron.json +++ b/res/trainers/data/elite_four_aaron.json @@ -23,7 +23,7 @@ "MOVE_U_TURN", "MOVE_DOUBLE_TEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_NIGHT_SLASH", "MOVE_QUICK_ATTACK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_HEAL_ORDER", "MOVE_POWER_GEM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_NIGHT_SLASH", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_ICE_FANG", "MOVE_AERIAL_ACE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/elite_four_aaron_rematch.json b/res/trainers/data/elite_four_aaron_rematch.json index bdbd012c51..7e0ddd0750 100644 --- a/res/trainers/data/elite_four_aaron_rematch.json +++ b/res/trainers/data/elite_four_aaron_rematch.json @@ -23,7 +23,7 @@ "MOVE_U_TURN", "MOVE_DOUBLE_TEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_NIGHT_SLASH", "MOVE_QUICK_ATTACK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_HEAL_ORDER", "MOVE_POWER_GEM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_NIGHT_SLASH", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_ICE_FANG", "MOVE_AERIAL_ACE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/elite_four_bertha.json b/res/trainers/data/elite_four_bertha.json index 8cba792128..79005a7db4 100644 --- a/res/trainers/data/elite_four_bertha.json +++ b/res/trainers/data/elite_four_bertha.json @@ -23,7 +23,7 @@ "MOVE_ZEN_HEADBUTT", "MOVE_SANDSTORM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_FIRE_FANG", "MOVE_THUNDER_FANG" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_CRUNCH", "MOVE_YAWN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_THUNDER_PUNCH", "MOVE_SANDSTORM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_MEGAHORN", "MOVE_AVALANCHE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/elite_four_bertha_rematch.json b/res/trainers/data/elite_four_bertha_rematch.json index 7613acae41..0b790e6f32 100644 --- a/res/trainers/data/elite_four_bertha_rematch.json +++ b/res/trainers/data/elite_four_bertha_rematch.json @@ -23,7 +23,7 @@ "MOVE_ZEN_HEADBUTT", "MOVE_SANDSTORM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_FIRE_FANG", "MOVE_THUNDER_FANG" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_CRUNCH", "MOVE_YAWN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_THUNDER_PUNCH", "MOVE_SANDSTORM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_MEGAHORN", "MOVE_AVALANCHE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/elite_four_flint.json b/res/trainers/data/elite_four_flint.json index 76a1da10c8..5fc48b0c84 100644 --- a/res/trainers/data/elite_four_flint.json +++ b/res/trainers/data/elite_four_flint.json @@ -23,7 +23,7 @@ "MOVE_DARK_PULSE", "MOVE_SUNNY_DAY" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_QUICK_ATTACK", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_BOUNCE", "MOVE_SUNNY_DAY" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_MACH_PUNCH", "MOVE_EARTHQUAKE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_SOLAR_BEAM", "MOVE_HYPER_BEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 13 } ], diff --git a/res/trainers/data/elite_four_flint_fight_area.json b/res/trainers/data/elite_four_flint_fight_area.json index b1dd2fa713..1975b4425f 100644 --- a/res/trainers/data/elite_four_flint_fight_area.json +++ b/res/trainers/data/elite_four_flint_fight_area.json @@ -23,7 +23,7 @@ "MOVE_DARK_PULSE", "MOVE_SUNNY_DAY" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_QUICK_ATTACK", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_SOLAR_BEAM", "MOVE_HYPER_BEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 13 } ], diff --git a/res/trainers/data/elite_four_flint_rematch.json b/res/trainers/data/elite_four_flint_rematch.json index 26f8daf02c..2b312cad93 100644 --- a/res/trainers/data/elite_four_flint_rematch.json +++ b/res/trainers/data/elite_four_flint_rematch.json @@ -23,7 +23,7 @@ "MOVE_DARK_PULSE", "MOVE_SUNNY_DAY" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_QUICK_ATTACK", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_BOUNCE", "MOVE_SUNNY_DAY" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_MACH_PUNCH", "MOVE_EARTHQUAKE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_SOLAR_BEAM", "MOVE_HYPER_BEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 13 } ], diff --git a/res/trainers/data/elite_four_lucian.json b/res/trainers/data/elite_four_lucian.json index 4f34fc4dd2..19059f06e1 100644 --- a/res/trainers/data/elite_four_lucian.json +++ b/res/trainers/data/elite_four_lucian.json @@ -24,7 +24,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -38,7 +38,7 @@ "MOVE_QUICK_ATTACK", "MOVE_SIGNAL_BEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -52,7 +52,7 @@ "MOVE_EARTHQUAKE", "MOVE_CALM_MIND" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -66,7 +66,7 @@ "MOVE_FOCUS_BLAST", "MOVE_RECOVER" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -80,7 +80,7 @@ "MOVE_LEAF_BLADE", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/elite_four_lucian_rematch.json b/res/trainers/data/elite_four_lucian_rematch.json index 8fdaa30856..071ca31254 100644 --- a/res/trainers/data/elite_four_lucian_rematch.json +++ b/res/trainers/data/elite_four_lucian_rematch.json @@ -24,7 +24,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -38,7 +38,7 @@ "MOVE_QUICK_ATTACK", "MOVE_SIGNAL_BEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -52,7 +52,7 @@ "MOVE_EARTHQUAKE", "MOVE_CALM_MIND" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -66,7 +66,7 @@ "MOVE_FOCUS_BLAST", "MOVE_RECOVER" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -80,7 +80,7 @@ "MOVE_LEAF_BLADE", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/factory_head_thorton_dummy.json b/res/trainers/data/factory_head_thorton_dummy.json index 609334588a..3b67eca3d8 100644 --- a/res/trainers/data/factory_head_thorton_dummy.json +++ b/res/trainers/data/factory_head_thorton_dummy.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_alec.json b/res/trainers/data/fisherman_alec.json index c4a097a55c..83aab68eeb 100644 --- a/res/trainers/data/fisherman_alec.json +++ b/res/trainers/data/fisherman_alec.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_alec_rematch.json b/res/trainers/data/fisherman_alec_rematch.json index 9589e63660..947c266086 100644 --- a/res/trainers/data/fisherman_alec_rematch.json +++ b/res/trainers/data/fisherman_alec_rematch.json @@ -13,7 +13,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_andrew.json b/res/trainers/data/fisherman_andrew.json index 1bf5cae85c..e4ed989d1b 100644 --- a/res/trainers/data/fisherman_andrew.json +++ b/res/trainers/data/fisherman_andrew.json @@ -13,7 +13,7 @@ "level": 8, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 10, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 12, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 12, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -49,7 +49,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -58,7 +58,7 @@ "level": 16, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_brett.json b/res/trainers/data/fisherman_brett.json index 418a3f064f..479160881f 100644 --- a/res/trainers/data/fisherman_brett.json +++ b/res/trainers/data/fisherman_brett.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_cody.json b/res/trainers/data/fisherman_cody.json index c22aa89cd2..d0619e1803 100644 --- a/res/trainers/data/fisherman_cody.json +++ b/res/trainers/data/fisherman_cody.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_cole.json b/res/trainers/data/fisherman_cole.json index 9412f00260..e5393394ba 100644 --- a/res/trainers/data/fisherman_cole.json +++ b/res/trainers/data/fisherman_cole.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 40, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_cory.json b/res/trainers/data/fisherman_cory.json index 8641ce04a8..cad0b2efa4 100644 --- a/res/trainers/data/fisherman_cory.json +++ b/res/trainers/data/fisherman_cory.json @@ -13,7 +13,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_erick.json b/res/trainers/data/fisherman_erick.json index 42a540be38..ca57206a76 100644 --- a/res/trainers/data/fisherman_erick.json +++ b/res/trainers/data/fisherman_erick.json @@ -18,7 +18,7 @@ "MOVE_FLAIL", "MOVE_SUPERSONIC" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_FLAIL", "MOVE_SUPERSONIC" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -44,7 +44,7 @@ "MOVE_THRASH", "MOVE_BITE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_george.json b/res/trainers/data/fisherman_george.json index 0d86913b33..8f74909246 100644 --- a/res/trainers/data/fisherman_george.json +++ b/res/trainers/data/fisherman_george.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_joseph.json b/res/trainers/data/fisherman_joseph.json index 2a8423de6c..f9449b80ba 100644 --- a/res/trainers/data/fisherman_joseph.json +++ b/res/trainers/data/fisherman_joseph.json @@ -13,7 +13,7 @@ "level": 17, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_joseph_rematch_1.json b/res/trainers/data/fisherman_joseph_rematch_1.json index bc17cbfa7a..85129b9140 100644 --- a/res/trainers/data/fisherman_joseph_rematch_1.json +++ b/res/trainers/data/fisherman_joseph_rematch_1.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_joseph_rematch_2.json b/res/trainers/data/fisherman_joseph_rematch_2.json index a672c83b2b..e79b106310 100644 --- a/res/trainers/data/fisherman_joseph_rematch_2.json +++ b/res/trainers/data/fisherman_joseph_rematch_2.json @@ -13,7 +13,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_josh.json b/res/trainers/data/fisherman_josh.json index 407f3bb89e..8211df3234 100644 --- a/res/trainers/data/fisherman_josh.json +++ b/res/trainers/data/fisherman_josh.json @@ -13,7 +13,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_juan.json b/res/trainers/data/fisherman_juan.json index dccbf5ab8c..16cdf829e1 100644 --- a/res/trainers/data/fisherman_juan.json +++ b/res/trainers/data/fisherman_juan.json @@ -13,7 +13,7 @@ "level": 29, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_kenneth.json b/res/trainers/data/fisherman_kenneth.json index 13db60fda2..b6c121d752 100644 --- a/res/trainers/data/fisherman_kenneth.json +++ b/res/trainers/data/fisherman_kenneth.json @@ -13,7 +13,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 28, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_luc.json b/res/trainers/data/fisherman_luc.json index 7d1228b44f..32bf013549 100644 --- a/res/trainers/data/fisherman_luc.json +++ b/res/trainers/data/fisherman_luc.json @@ -13,7 +13,7 @@ "level": 29, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 29, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -49,7 +49,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_miguel.json b/res/trainers/data/fisherman_miguel.json index a59c55d784..dc64e690c3 100644 --- a/res/trainers/data/fisherman_miguel.json +++ b/res/trainers/data/fisherman_miguel.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_miguel_rematch.json b/res/trainers/data/fisherman_miguel_rematch.json index ee7e0d7766..3d69ac572d 100644 --- a/res/trainers/data/fisherman_miguel_rematch.json +++ b/res/trainers/data/fisherman_miguel_rematch.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_travis.json b/res/trainers/data/fisherman_travis.json index cdef424e86..951a8ea7e6 100644 --- a/res/trainers/data/fisherman_travis.json +++ b/res/trainers/data/fisherman_travis.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_walter.json b/res/trainers/data/fisherman_walter.json index 9a8a0c3501..380e107ba9 100644 --- a/res/trainers/data/fisherman_walter.json +++ b/res/trainers/data/fisherman_walter.json @@ -16,7 +16,7 @@ "MOVE_WATER_PULSE", "MOVE_MAGNITUDE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/fisherman_zachary.json b/res/trainers/data/fisherman_zachary.json index d234e98115..043e114b63 100644 --- a/res/trainers/data/fisherman_zachary.json +++ b/res/trainers/data/fisherman_zachary.json @@ -13,7 +13,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 16, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_boss_cyrus_celestic_town_ruins.json b/res/trainers/data/galactic_boss_cyrus_celestic_town_ruins.json index e6f516cea2..d2de8c366e 100644 --- a/res/trainers/data/galactic_boss_cyrus_celestic_town_ruins.json +++ b/res/trainers/data/galactic_boss_cyrus_celestic_town_ruins.json @@ -22,7 +22,7 @@ "MOVE_QUICK_ATTACK", "MOVE_SCREECH" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -36,7 +36,7 @@ "MOVE_BITE", "MOVE_SUPERSONIC" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -50,7 +50,7 @@ "MOVE_ASTONISH", "MOVE_FAINT_ATTACK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_boss_cyrus_distortion_world.json b/res/trainers/data/galactic_boss_cyrus_distortion_world.json index ae6a8ad211..cebdee7b62 100644 --- a/res/trainers/data/galactic_boss_cyrus_distortion_world.json +++ b/res/trainers/data/galactic_boss_cyrus_distortion_world.json @@ -23,7 +23,7 @@ "MOVE_WILL_O_WISP", "MOVE_THUNDER_FANG" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_HEAT_WAVE", "MOVE_PSYCHIC" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_TOXIC", "MOVE_CONFUSE_RAY" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_ICE_FANG", "MOVE_EARTHQUAKE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_FAKE_OUT", "MOVE_X_SCISSOR" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_boss_cyrus_galactic_hq.json b/res/trainers/data/galactic_boss_cyrus_galactic_hq.json index e8a4d687a1..712649b107 100644 --- a/res/trainers/data/galactic_boss_cyrus_galactic_hq.json +++ b/res/trainers/data/galactic_boss_cyrus_galactic_hq.json @@ -23,7 +23,7 @@ "MOVE_QUICK_ATTACK", "MOVE_SCREECH" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_BITE", "MOVE_SUPERSONIC" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_ASTONISH", "MOVE_FAINT_ATTACK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_celestic_town.json b/res/trainers/data/galactic_grunt_celestic_town.json index 77637f49d8..2deec00475 100644 --- a/res/trainers/data/galactic_grunt_celestic_town.json +++ b/res/trainers/data/galactic_grunt_celestic_town.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 30, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_floaroma_meadow_1.json b/res/trainers/data/galactic_grunt_floaroma_meadow_1.json index 6efb1723e2..97ab2d0ac2 100644 --- a/res/trainers/data/galactic_grunt_floaroma_meadow_1.json +++ b/res/trainers/data/galactic_grunt_floaroma_meadow_1.json @@ -13,7 +13,7 @@ "level": 13, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_floaroma_meadow_2.json b/res/trainers/data/galactic_grunt_floaroma_meadow_2.json index 08c4cb4d4c..05ce58675e 100644 --- a/res/trainers/data/galactic_grunt_floaroma_meadow_2.json +++ b/res/trainers/data/galactic_grunt_floaroma_meadow_2.json @@ -13,7 +13,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_1f.json b/res/trainers/data/galactic_grunt_galactic_hq_1f.json index 93d85ffb7f..89fd6427f3 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_1f.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_1f.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_2f_1.json b/res/trainers/data/galactic_grunt_galactic_hq_2f_1.json index e1c71a8c8f..c61711e3c1 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_2f_1.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_2f_1.json @@ -13,7 +13,7 @@ "level": 37, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_2f_2.json b/res/trainers/data/galactic_grunt_galactic_hq_2f_2.json index fbff2f9c9b..8a80e31891 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_2f_2.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_2f_2.json @@ -13,7 +13,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_2f_3.json b/res/trainers/data/galactic_grunt_galactic_hq_2f_3.json index e29227d174..7c9d0efeb8 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_2f_3.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_2f_3.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_3f_1.json b/res/trainers/data/galactic_grunt_galactic_hq_3f_1.json index c23cbf452c..fc81752c57 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_3f_1.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_3f_1.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_3f_2.json b/res/trainers/data/galactic_grunt_galactic_hq_3f_2.json index cf6b3be1c2..696e0f6624 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_3f_2.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_3f_2.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_3f_3.json b/res/trainers/data/galactic_grunt_galactic_hq_3f_3.json index 228b41e32d..64157b3c25 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_3f_3.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_3f_3.json @@ -13,7 +13,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_3f_4.json b/res/trainers/data/galactic_grunt_galactic_hq_3f_4.json index 70728f3c91..a87a254eff 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_3f_4.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_3f_4.json @@ -13,7 +13,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_b2f_1.json b/res/trainers/data/galactic_grunt_galactic_hq_b2f_1.json index 367034ad65..acd949bcb2 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_b2f_1.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_b2f_1.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_galactic_hq_b2f_2.json b/res/trainers/data/galactic_grunt_galactic_hq_b2f_2.json index ddc966ecbb..1ba08b45ae 100644 --- a/res/trainers/data/galactic_grunt_galactic_hq_b2f_2.json +++ b/res/trainers/data/galactic_grunt_galactic_hq_b2f_2.json @@ -13,7 +13,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_iron_island_1.json b/res/trainers/data/galactic_grunt_iron_island_1.json index 2c2dacc010..a57d4399f8 100644 --- a/res/trainers/data/galactic_grunt_iron_island_1.json +++ b/res/trainers/data/galactic_grunt_iron_island_1.json @@ -13,7 +13,7 @@ "level": 34, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 34, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 34, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_iron_island_2.json b/res/trainers/data/galactic_grunt_iron_island_2.json index 7e4df65caf..fa78b9788d 100644 --- a/res/trainers/data/galactic_grunt_iron_island_2.json +++ b/res/trainers/data/galactic_grunt_iron_island_2.json @@ -13,7 +13,7 @@ "level": 34, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 34, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 34, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_jubilife_city_1.json b/res/trainers/data/galactic_grunt_jubilife_city_1.json index 348cd217ce..faee61b82f 100644 --- a/res/trainers/data/galactic_grunt_jubilife_city_1.json +++ b/res/trainers/data/galactic_grunt_jubilife_city_1.json @@ -13,7 +13,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_jubilife_city_2.json b/res/trainers/data/galactic_grunt_jubilife_city_2.json index 6c2cef8d63..f0d614b09a 100644 --- a/res/trainers/data/galactic_grunt_jubilife_city_2.json +++ b/res/trainers/data/galactic_grunt_jubilife_city_2.json @@ -13,7 +13,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_lake_valor_1.json b/res/trainers/data/galactic_grunt_lake_valor_1.json index 817a11da48..08ed56a36b 100644 --- a/res/trainers/data/galactic_grunt_lake_valor_1.json +++ b/res/trainers/data/galactic_grunt_lake_valor_1.json @@ -13,7 +13,7 @@ "level": 37, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_lake_valor_2.json b/res/trainers/data/galactic_grunt_lake_valor_2.json index a3b33b1895..4c8ae742c5 100644 --- a/res/trainers/data/galactic_grunt_lake_valor_2.json +++ b/res/trainers/data/galactic_grunt_lake_valor_2.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 33, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 33, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_lake_valor_3.json b/res/trainers/data/galactic_grunt_lake_valor_3.json index 5efa5b8321..31a3447a4f 100644 --- a/res/trainers/data/galactic_grunt_lake_valor_3.json +++ b/res/trainers/data/galactic_grunt_lake_valor_3.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 35, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_lake_verity_1.json b/res/trainers/data/galactic_grunt_lake_verity_1.json index e55f19ebb7..f2b64cc59d 100644 --- a/res/trainers/data/galactic_grunt_lake_verity_1.json +++ b/res/trainers/data/galactic_grunt_lake_verity_1.json @@ -13,7 +13,7 @@ "level": 37, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_lake_verity_2.json b/res/trainers/data/galactic_grunt_lake_verity_2.json index a44fd57037..39cdf4e117 100644 --- a/res/trainers/data/galactic_grunt_lake_verity_2.json +++ b/res/trainers/data/galactic_grunt_lake_verity_2.json @@ -18,7 +18,7 @@ "MOVE_GROWL", "MOVE_FAKE_OUT" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_BITE", "MOVE_SUPERSONIC" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -45,7 +45,7 @@ "MOVE_NIGHT_SHADE", "MOVE_WING_ATTACK" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_lake_verity_3.json b/res/trainers/data/galactic_grunt_lake_verity_3.json index 824b9e94d5..1f2d3e4f08 100644 --- a/res/trainers/data/galactic_grunt_lake_verity_3.json +++ b/res/trainers/data/galactic_grunt_lake_verity_3.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 35, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_lake_verity_4.json b/res/trainers/data/galactic_grunt_lake_verity_4.json index 65780e602f..0b9438b135 100644 --- a/res/trainers/data/galactic_grunt_lake_verity_4.json +++ b/res/trainers/data/galactic_grunt_lake_verity_4.json @@ -13,7 +13,7 @@ "level": 34, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 36, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_3f_1.json b/res/trainers/data/galactic_grunt_mt_coronet_3f_1.json index db69c893ab..1ce11df630 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_3f_1.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_3f_1.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_3f_2.json b/res/trainers/data/galactic_grunt_mt_coronet_3f_2.json index 8148942bc1..3dae6554b3 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_3f_2.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_3f_2.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_4f_1.json b/res/trainers/data/galactic_grunt_mt_coronet_4f_1.json index fb160d22b1..2fe7b318bb 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_4f_1.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_4f_1.json @@ -13,7 +13,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_4f_2.json b/res/trainers/data/galactic_grunt_mt_coronet_4f_2.json index 1db7010abf..b30936cff0 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_4f_2.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_4f_2.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_5f_1.json b/res/trainers/data/galactic_grunt_mt_coronet_5f_1.json index be6a0fc298..0857c05ae6 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_5f_1.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_5f_1.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 41, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_5f_2.json b/res/trainers/data/galactic_grunt_mt_coronet_5f_2.json index d745f4d2ac..38eff703e1 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_5f_2.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_5f_2.json @@ -13,7 +13,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_6f.json b/res/trainers/data/galactic_grunt_mt_coronet_6f.json index a9dd4c1007..04300e2974 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_6f.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_6f.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 41, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_1.json b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_1.json index 1efe0539ae..174b736e00 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_1.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_1.json @@ -13,7 +13,7 @@ "level": 38, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 40, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 42, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_2.json b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_2.json index 850ca0f713..481c6b7863 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_2.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_2.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_3.json b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_3.json index 763c8ef6e8..bc5a719f09 100644 --- a/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_3.json +++ b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_3.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_spear_pillar_1.json b/res/trainers/data/galactic_grunt_spear_pillar_1.json index ba02acb9ad..1cd598ca46 100644 --- a/res/trainers/data/galactic_grunt_spear_pillar_1.json +++ b/res/trainers/data/galactic_grunt_spear_pillar_1.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_spear_pillar_2.json b/res/trainers/data/galactic_grunt_spear_pillar_2.json index b7171c60b4..3c23120e96 100644 --- a/res/trainers/data/galactic_grunt_spear_pillar_2.json +++ b/res/trainers/data/galactic_grunt_spear_pillar_2.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 41, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_1.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_1.json index 4dde667883..1bef21cf85 100644 --- a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_1.json +++ b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_1.json @@ -13,7 +13,7 @@ "level": 17, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 17, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_2.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_2.json index 623f312883..e0d1cf9a15 100644 --- a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_2.json +++ b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_2.json @@ -13,7 +13,7 @@ "level": 16, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_1.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_1.json index 94949a5855..05cab374c5 100644 --- a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_1.json +++ b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_1.json @@ -13,7 +13,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_2.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_2.json index ae70fa8f56..31c650acb8 100644 --- a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_2.json +++ b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_2.json @@ -13,7 +13,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_3f.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_3f.json index 400a0ebf3b..456560ad8c 100644 --- a/res/trainers/data/galactic_grunt_team_galactic_eterna_building_3f.json +++ b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_3f.json @@ -13,7 +13,7 @@ "level": 16, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 16, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 16, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_valley_windworks_1.json b/res/trainers/data/galactic_grunt_valley_windworks_1.json index 86baad1ddd..374f5a45fe 100644 --- a/res/trainers/data/galactic_grunt_valley_windworks_1.json +++ b/res/trainers/data/galactic_grunt_valley_windworks_1.json @@ -13,7 +13,7 @@ "level": 13, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_valley_windworks_2.json b/res/trainers/data/galactic_grunt_valley_windworks_2.json index 4b86e46135..983073a3aa 100644 --- a/res/trainers/data/galactic_grunt_valley_windworks_2.json +++ b/res/trainers/data/galactic_grunt_valley_windworks_2.json @@ -13,7 +13,7 @@ "level": 13, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_valley_windworks_3.json b/res/trainers/data/galactic_grunt_valley_windworks_3.json index 04baff4c13..847fa97f5b 100644 --- a/res/trainers/data/galactic_grunt_valley_windworks_3.json +++ b/res/trainers/data/galactic_grunt_valley_windworks_3.json @@ -13,7 +13,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_valor_lakefront.json b/res/trainers/data/galactic_grunt_valor_lakefront.json index 15c6fb5bd8..f98ce004b3 100644 --- a/res/trainers/data/galactic_grunt_valor_lakefront.json +++ b/res/trainers/data/galactic_grunt_valor_lakefront.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_veilstone_city_1.json b/res/trainers/data/galactic_grunt_veilstone_city_1.json index 5125706960..f8ed39533a 100644 --- a/res/trainers/data/galactic_grunt_veilstone_city_1.json +++ b/res/trainers/data/galactic_grunt_veilstone_city_1.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 26, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/galactic_grunt_veilstone_city_2.json b/res/trainers/data/galactic_grunt_veilstone_city_2.json index ae28c92672..86d08af4a1 100644 --- a/res/trainers/data/galactic_grunt_veilstone_city_2.json +++ b/res/trainers/data/galactic_grunt_veilstone_city_2.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 26, "item": null, "moves": null, - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/gentleman_jeremy.json b/res/trainers/data/gentleman_jeremy.json index e7f714d361..234011a2f2 100644 --- a/res/trainers/data/gentleman_jeremy.json +++ b/res/trainers/data/gentleman_jeremy.json @@ -15,7 +15,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 22 } ], diff --git a/res/trainers/data/gentleman_jeremy_rematch_1.json b/res/trainers/data/gentleman_jeremy_rematch_1.json index 9c82765a21..9bff680db2 100644 --- a/res/trainers/data/gentleman_jeremy_rematch_1.json +++ b/res/trainers/data/gentleman_jeremy_rematch_1.json @@ -15,7 +15,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 22 } ], diff --git a/res/trainers/data/gentleman_jeremy_rematch_2.json b/res/trainers/data/gentleman_jeremy_rematch_2.json index 09050f4f10..e0a7a72e63 100644 --- a/res/trainers/data/gentleman_jeremy_rematch_2.json +++ b/res/trainers/data/gentleman_jeremy_rematch_2.json @@ -15,7 +15,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 22 } ], diff --git a/res/trainers/data/gentleman_jeremy_rematch_3.json b/res/trainers/data/gentleman_jeremy_rematch_3.json index 64db4441f1..d5b2fed52e 100644 --- a/res/trainers/data/gentleman_jeremy_rematch_3.json +++ b/res/trainers/data/gentleman_jeremy_rematch_3.json @@ -15,7 +15,7 @@ "level": 61, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 22 } ], diff --git a/res/trainers/data/gentleman_leonardo.json b/res/trainers/data/gentleman_leonardo.json index 3ea9e5f4c0..db941ebf3e 100644 --- a/res/trainers/data/gentleman_leonardo.json +++ b/res/trainers/data/gentleman_leonardo.json @@ -20,7 +20,7 @@ "MOVE_FURY_ATTACK", "MOVE_ROOST" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_arturo.json b/res/trainers/data/guitarist_arturo.json index c13be01806..d806fb8dfa 100644 --- a/res/trainers/data/guitarist_arturo.json +++ b/res/trainers/data/guitarist_arturo.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_arturo_rematch_1.json b/res/trainers/data/guitarist_arturo_rematch_1.json index 8fb58727ee..dd56b3fd1c 100644 --- a/res/trainers/data/guitarist_arturo_rematch_1.json +++ b/res/trainers/data/guitarist_arturo_rematch_1.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_arturo_rematch_2.json b/res/trainers/data/guitarist_arturo_rematch_2.json index 542285bcd5..09c75ff52d 100644 --- a/res/trainers/data/guitarist_arturo_rematch_2.json +++ b/res/trainers/data/guitarist_arturo_rematch_2.json @@ -13,7 +13,7 @@ "level": 47, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_arturo_rematch_3.json b/res/trainers/data/guitarist_arturo_rematch_3.json index 2eaab6bde6..95b8657949 100644 --- a/res/trainers/data/guitarist_arturo_rematch_3.json +++ b/res/trainers/data/guitarist_arturo_rematch_3.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_arturo_rematch_4.json b/res/trainers/data/guitarist_arturo_rematch_4.json index 6405573a57..973024ce47 100644 --- a/res/trainers/data/guitarist_arturo_rematch_4.json +++ b/res/trainers/data/guitarist_arturo_rematch_4.json @@ -13,7 +13,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_arturo_unused.json b/res/trainers/data/guitarist_arturo_unused.json index bb4ed6fbd2..f9a43b4a52 100644 --- a/res/trainers/data/guitarist_arturo_unused.json +++ b/res/trainers/data/guitarist_arturo_unused.json @@ -13,7 +13,7 @@ "level": 7, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_jerry.json b/res/trainers/data/guitarist_jerry.json index 064fc45ed0..99f20b81ac 100644 --- a/res/trainers/data/guitarist_jerry.json +++ b/res/trainers/data/guitarist_jerry.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 44, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 44, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_lonnie.json b/res/trainers/data/guitarist_lonnie.json index e13c98248d..0c3ba51458 100644 --- a/res/trainers/data/guitarist_lonnie.json +++ b/res/trainers/data/guitarist_lonnie.json @@ -18,7 +18,7 @@ "MOVE_THUNDER_WAVE", "MOVE_QUICK_ATTACK" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_preston.json b/res/trainers/data/guitarist_preston.json index 2f7f0f2f4e..16be48fac0 100644 --- a/res/trainers/data/guitarist_preston.json +++ b/res/trainers/data/guitarist_preston.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 45, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/guitarist_tony.json b/res/trainers/data/guitarist_tony.json index fc62ccb01d..89bf089a62 100644 --- a/res/trainers/data/guitarist_tony.json +++ b/res/trainers/data/guitarist_tony.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 18 } ], diff --git a/res/trainers/data/guitarist_tony_rematch.json b/res/trainers/data/guitarist_tony_rematch.json index ea29ffef70..694f168b67 100644 --- a/res/trainers/data/guitarist_tony_rematch.json +++ b/res/trainers/data/guitarist_tony_rematch.json @@ -13,7 +13,7 @@ "level": 52, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 52, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 18 } ], diff --git a/res/trainers/data/hall_matron_argenta_dummy.json b/res/trainers/data/hall_matron_argenta_dummy.json index f13e158d99..c30ab0e0ef 100644 --- a/res/trainers/data/hall_matron_argenta_dummy.json +++ b/res/trainers/data/hall_matron_argenta_dummy.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_alexander.json b/res/trainers/data/hiker_alexander.json index 61fe59dbe7..d17512997b 100644 --- a/res/trainers/data/hiker_alexander.json +++ b/res/trainers/data/hiker_alexander.json @@ -14,7 +14,7 @@ "level": 38, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 40, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_damon.json b/res/trainers/data/hiker_damon.json index b2e0cafa96..724b34c6fd 100644 --- a/res/trainers/data/hiker_damon.json +++ b/res/trainers/data/hiker_damon.json @@ -14,7 +14,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_daniel.json b/res/trainers/data/hiker_daniel.json index d412db9633..c3e2afbca2 100644 --- a/res/trainers/data/hiker_daniel.json +++ b/res/trainers/data/hiker_daniel.json @@ -14,7 +14,7 @@ "level": 10, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 12, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_jonathan.json b/res/trainers/data/hiker_jonathan.json index 26a4b420d0..c3dbf1fa98 100644 --- a/res/trainers/data/hiker_jonathan.json +++ b/res/trainers/data/hiker_jonathan.json @@ -14,7 +14,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_justin.json b/res/trainers/data/hiker_justin.json index 92e977fc02..252ce7db8e 100644 --- a/res/trainers/data/hiker_justin.json +++ b/res/trainers/data/hiker_justin.json @@ -14,7 +14,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_kevin.json b/res/trainers/data/hiker_kevin.json index 4feb1d560a..143b265bbf 100644 --- a/res/trainers/data/hiker_kevin.json +++ b/res/trainers/data/hiker_kevin.json @@ -14,7 +14,7 @@ "level": 17, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 17, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -41,7 +41,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_lorenzo.json b/res/trainers/data/hiker_lorenzo.json index c395bfa915..c6d7989342 100644 --- a/res/trainers/data/hiker_lorenzo.json +++ b/res/trainers/data/hiker_lorenzo.json @@ -14,7 +14,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_louis.json b/res/trainers/data/hiker_louis.json index c776dc9214..9ea2c5d8ab 100644 --- a/res/trainers/data/hiker_louis.json +++ b/res/trainers/data/hiker_louis.json @@ -14,7 +14,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_maurice.json b/res/trainers/data/hiker_maurice.json index 5264c62636..3408d0b95c 100644 --- a/res/trainers/data/hiker_maurice.json +++ b/res/trainers/data/hiker_maurice.json @@ -14,7 +14,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_nicholas.json b/res/trainers/data/hiker_nicholas.json index c966ea60d4..67b864b32a 100644 --- a/res/trainers/data/hiker_nicholas.json +++ b/res/trainers/data/hiker_nicholas.json @@ -14,7 +14,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_reginald.json b/res/trainers/data/hiker_reginald.json index d2744d960c..8f413ded02 100644 --- a/res/trainers/data/hiker_reginald.json +++ b/res/trainers/data/hiker_reginald.json @@ -14,7 +14,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_robert.json b/res/trainers/data/hiker_robert.json index 15d59365b2..d671ccc7de 100644 --- a/res/trainers/data/hiker_robert.json +++ b/res/trainers/data/hiker_robert.json @@ -14,7 +14,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_theodore.json b/res/trainers/data/hiker_theodore.json index 30ede107c0..5f83348043 100644 --- a/res/trainers/data/hiker_theodore.json +++ b/res/trainers/data/hiker_theodore.json @@ -14,7 +14,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_theodore_rematch_1.json b/res/trainers/data/hiker_theodore_rematch_1.json index 3befa29e60..87096cf3fd 100644 --- a/res/trainers/data/hiker_theodore_rematch_1.json +++ b/res/trainers/data/hiker_theodore_rematch_1.json @@ -14,7 +14,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_theodore_rematch_2.json b/res/trainers/data/hiker_theodore_rematch_2.json index 5793680726..aa1015e33f 100644 --- a/res/trainers/data/hiker_theodore_rematch_2.json +++ b/res/trainers/data/hiker_theodore_rematch_2.json @@ -14,7 +14,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/hiker_theodore_rematch_3.json b/res/trainers/data/hiker_theodore_rematch_3.json index 6baa809135..d6b7b60c8b 100644 --- a/res/trainers/data/hiker_theodore_rematch_3.json +++ b/res/trainers/data/hiker_theodore_rematch_3.json @@ -14,7 +14,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/idol_grace.json b/res/trainers/data/idol_grace.json index 2d4fc44f5c..df78fcfd40 100644 --- a/res/trainers/data/idol_grace.json +++ b/res/trainers/data/idol_grace.json @@ -13,7 +13,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 2 }, { @@ -22,7 +22,7 @@ "level": 21, "item": null, "moves": null, - "power": 40, + "iv_scale": 40, "ball_seal": 2 } ], diff --git a/res/trainers/data/idol_grace_rematch_1.json b/res/trainers/data/idol_grace_rematch_1.json index 7bd9972f9f..f0e00dc83e 100644 --- a/res/trainers/data/idol_grace_rematch_1.json +++ b/res/trainers/data/idol_grace_rematch_1.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 2 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 40, + "iv_scale": 40, "ball_seal": 2 }, { @@ -31,7 +31,7 @@ "level": 32, "item": null, "moves": null, - "power": 80, + "iv_scale": 80, "ball_seal": 2 } ], diff --git a/res/trainers/data/idol_grace_rematch_2.json b/res/trainers/data/idol_grace_rematch_2.json index 896201db16..e1de09ba91 100644 --- a/res/trainers/data/idol_grace_rematch_2.json +++ b/res/trainers/data/idol_grace_rematch_2.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 2 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 40, + "iv_scale": 40, "ball_seal": 2 }, { @@ -31,7 +31,7 @@ "level": 43, "item": null, "moves": null, - "power": 80, + "iv_scale": 80, "ball_seal": 2 }, { @@ -40,7 +40,7 @@ "level": 43, "item": null, "moves": null, - "power": 120, + "iv_scale": 120, "ball_seal": 2 } ], diff --git a/res/trainers/data/idol_grace_rematch_3.json b/res/trainers/data/idol_grace_rematch_3.json index 1d992ce26b..ebd46e5549 100644 --- a/res/trainers/data/idol_grace_rematch_3.json +++ b/res/trainers/data/idol_grace_rematch_3.json @@ -13,7 +13,7 @@ "level": 48, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 2 }, { @@ -22,7 +22,7 @@ "level": 48, "item": null, "moves": null, - "power": 40, + "iv_scale": 40, "ball_seal": 2 }, { @@ -31,7 +31,7 @@ "level": 48, "item": null, "moves": null, - "power": 80, + "iv_scale": 80, "ball_seal": 2 }, { @@ -40,7 +40,7 @@ "level": 48, "item": null, "moves": null, - "power": 120, + "iv_scale": 120, "ball_seal": 2 }, { @@ -49,7 +49,7 @@ "level": 48, "item": null, "moves": null, - "power": 160, + "iv_scale": 160, "ball_seal": 2 } ], diff --git a/res/trainers/data/idol_grace_rematch_4.json b/res/trainers/data/idol_grace_rematch_4.json index 5a9652f3f0..21aa69bc9d 100644 --- a/res/trainers/data/idol_grace_rematch_4.json +++ b/res/trainers/data/idol_grace_rematch_4.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 2 }, { @@ -22,7 +22,7 @@ "level": 53, "item": null, "moves": null, - "power": 40, + "iv_scale": 40, "ball_seal": 2 }, { @@ -31,7 +31,7 @@ "level": 53, "item": null, "moves": null, - "power": 80, + "iv_scale": 80, "ball_seal": 2 }, { @@ -40,7 +40,7 @@ "level": 53, "item": null, "moves": null, - "power": 120, + "iv_scale": 120, "ball_seal": 2 }, { @@ -49,7 +49,7 @@ "level": 53, "item": null, "moves": null, - "power": 160, + "iv_scale": 160, "ball_seal": 2 }, { @@ -58,7 +58,7 @@ "level": 53, "item": null, "moves": null, - "power": 200, + "iv_scale": 200, "ball_seal": 2 } ], diff --git a/res/trainers/data/idol_grace_unused.json b/res/trainers/data/idol_grace_unused.json index af33a11fa8..eb7fd3f623 100644 --- a/res/trainers/data/idol_grace_unused.json +++ b/res/trainers/data/idol_grace_unused.json @@ -13,7 +13,7 @@ "level": 6, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 2 } ], diff --git a/res/trainers/data/interviewers_roxy_and_oli.json b/res/trainers/data/interviewers_roxy_and_oli.json index f68139d904..5d36150cdb 100644 --- a/res/trainers/data/interviewers_roxy_and_oli.json +++ b/res/trainers/data/interviewers_roxy_and_oli.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/interviewers_roxy_and_oli_rematch_1.json b/res/trainers/data/interviewers_roxy_and_oli_rematch_1.json index 040209b13a..f8394ef793 100644 --- a/res/trainers/data/interviewers_roxy_and_oli_rematch_1.json +++ b/res/trainers/data/interviewers_roxy_and_oli_rematch_1.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/interviewers_roxy_and_oli_rematch_2.json b/res/trainers/data/interviewers_roxy_and_oli_rematch_2.json index 9ffc6922b7..dd2c4e617a 100644 --- a/res/trainers/data/interviewers_roxy_and_oli_rematch_2.json +++ b/res/trainers/data/interviewers_roxy_and_oli_rematch_2.json @@ -13,7 +13,7 @@ "level": 47, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 47, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/interviewers_roxy_and_oli_rematch_3.json b/res/trainers/data/interviewers_roxy_and_oli_rematch_3.json index 69783ba13a..4403adc003 100644 --- a/res/trainers/data/interviewers_roxy_and_oli_rematch_3.json +++ b/res/trainers/data/interviewers_roxy_and_oli_rematch_3.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/interviewers_roxy_and_oli_rematch_4.json b/res/trainers/data/interviewers_roxy_and_oli_rematch_4.json index 24e8b0cfe8..58f7a0119e 100644 --- a/res/trainers/data/interviewers_roxy_and_oli_rematch_4.json +++ b/res/trainers/data/interviewers_roxy_and_oli_rematch_4.json @@ -13,7 +13,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/interviewers_roxy_and_oli_unused.json b/res/trainers/data/interviewers_roxy_and_oli_unused.json index e44b92fc41..43bc85e8a4 100644 --- a/res/trainers/data/interviewers_roxy_and_oli_unused.json +++ b/res/trainers/data/interviewers_roxy_and_oli_unused.json @@ -13,7 +13,7 @@ "level": 6, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 6, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/jogger_craig.json b/res/trainers/data/jogger_craig.json index d13d14b091..4b8574db3e 100644 --- a/res/trainers/data/jogger_craig.json +++ b/res/trainers/data/jogger_craig.json @@ -13,7 +13,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/jogger_craig_rematch_1.json b/res/trainers/data/jogger_craig_rematch_1.json index 957f8e5f83..98d4198e76 100644 --- a/res/trainers/data/jogger_craig_rematch_1.json +++ b/res/trainers/data/jogger_craig_rematch_1.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/jogger_craig_rematch_2.json b/res/trainers/data/jogger_craig_rematch_2.json index a3a284f474..a7c0165088 100644 --- a/res/trainers/data/jogger_craig_rematch_2.json +++ b/res/trainers/data/jogger_craig_rematch_2.json @@ -13,7 +13,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/jogger_raul.json b/res/trainers/data/jogger_raul.json index accfe90b9c..fa25f68904 100644 --- a/res/trainers/data/jogger_raul.json +++ b/res/trainers/data/jogger_raul.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/jogger_richard.json b/res/trainers/data/jogger_richard.json index 67a3b4eb61..364686fe2a 100644 --- a/res/trainers/data/jogger_richard.json +++ b/res/trainers/data/jogger_richard.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/jogger_scott.json b/res/trainers/data/jogger_scott.json index 49f879329a..6e092c3a19 100644 --- a/res/trainers/data/jogger_scott.json +++ b/res/trainers/data/jogger_scott.json @@ -13,7 +13,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/jogger_wyatt.json b/res/trainers/data/jogger_wyatt.json index 498785e436..e1067a1536 100644 --- a/res/trainers/data/jogger_wyatt.json +++ b/res/trainers/data/jogger_wyatt.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lady_celeste.json b/res/trainers/data/lady_celeste.json index 24600bc2f1..a1c549cdf3 100644 --- a/res/trainers/data/lady_celeste.json +++ b/res/trainers/data/lady_celeste.json @@ -20,7 +20,7 @@ "MOVE_EGG_BOMB", "MOVE_PSYCHIC" ], - "power": 250, + "iv_scale": 250, "ball_seal": 27 } ], diff --git a/res/trainers/data/lady_kylie.json b/res/trainers/data/lady_kylie.json index 75422f46bd..7dabff54d4 100644 --- a/res/trainers/data/lady_kylie.json +++ b/res/trainers/data/lady_kylie.json @@ -15,7 +15,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lady_melissa.json b/res/trainers/data/lady_melissa.json index afe16cdd6e..5c4f0337a4 100644 --- a/res/trainers/data/lady_melissa.json +++ b/res/trainers/data/lady_melissa.json @@ -15,7 +15,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lady_melissa_rematch_1.json b/res/trainers/data/lady_melissa_rematch_1.json index 35db29e6ee..6c873ba3af 100644 --- a/res/trainers/data/lady_melissa_rematch_1.json +++ b/res/trainers/data/lady_melissa_rematch_1.json @@ -15,7 +15,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lady_melissa_rematch_2.json b/res/trainers/data/lady_melissa_rematch_2.json index 02b6f70bda..3598b593c1 100644 --- a/res/trainers/data/lady_melissa_rematch_2.json +++ b/res/trainers/data/lady_melissa_rematch_2.json @@ -20,7 +20,7 @@ "MOVE_LEECH_SEED", "MOVE_MAGICAL_LEAF" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lady_melissa_rematch_3.json b/res/trainers/data/lady_melissa_rematch_3.json index c66eaa0dd0..af45ebff89 100644 --- a/res/trainers/data/lady_melissa_rematch_3.json +++ b/res/trainers/data/lady_melissa_rematch_3.json @@ -20,7 +20,7 @@ "MOVE_GIGA_DRAIN", "MOVE_AERIAL_ACE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_LEECH_SEED", "MOVE_MAGICAL_LEAF" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_STUN_SPORE", "MOVE_MAGICAL_LEAF" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_blythe.json b/res/trainers/data/lass_blythe.json index 6d716cf795..ad98262c40 100644 --- a/res/trainers/data/lass_blythe.json +++ b/res/trainers/data/lass_blythe.json @@ -13,7 +13,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_briana.json b/res/trainers/data/lass_briana.json index 6df597c474..900ac7c269 100644 --- a/res/trainers/data/lass_briana.json +++ b/res/trainers/data/lass_briana.json @@ -13,7 +13,7 @@ "level": 16, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_caroline.json b/res/trainers/data/lass_caroline.json index b09c614ae4..800618e525 100644 --- a/res/trainers/data/lass_caroline.json +++ b/res/trainers/data/lass_caroline.json @@ -16,7 +16,7 @@ "MOVE_TACKLE", "MOVE_LEECH_SEED" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 }, { @@ -29,7 +29,7 @@ "MOVE_POISON_STING", "MOVE_STUN_SPORE" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_carrie_unused_1.json b/res/trainers/data/lass_carrie_unused_1.json index aff8649020..d9fd54dab4 100644 --- a/res/trainers/data/lass_carrie_unused_1.json +++ b/res/trainers/data/lass_carrie_unused_1.json @@ -16,7 +16,7 @@ "MOVE_BLOCK", "MOVE_ROCK_THROW" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -29,7 +29,7 @@ "MOVE_LIGHT_SCREEN", "MOVE_DOUBLE_SLAP" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_carrie_unused_2.json b/res/trainers/data/lass_carrie_unused_2.json index 60c72d2bfc..181b824725 100644 --- a/res/trainers/data/lass_carrie_unused_2.json +++ b/res/trainers/data/lass_carrie_unused_2.json @@ -18,7 +18,7 @@ "MOVE_GROWL", "MOVE_PECK" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_SPARK", "MOVE_CHARM" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_carrie_unused_3.json b/res/trainers/data/lass_carrie_unused_3.json index 697545ad2d..d0a9848ac4 100644 --- a/res/trainers/data/lass_carrie_unused_3.json +++ b/res/trainers/data/lass_carrie_unused_3.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_cassidy.json b/res/trainers/data/lass_cassidy.json index c803f3aa32..d2d6a8deeb 100644 --- a/res/trainers/data/lass_cassidy.json +++ b/res/trainers/data/lass_cassidy.json @@ -13,7 +13,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_kaitlin.json b/res/trainers/data/lass_kaitlin.json index 9d16e1b444..8a67abd0b8 100644 --- a/res/trainers/data/lass_kaitlin.json +++ b/res/trainers/data/lass_kaitlin.json @@ -14,7 +14,7 @@ "level": 4, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 4, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 4, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -41,7 +41,7 @@ "level": 4, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_madeline.json b/res/trainers/data/lass_madeline.json index 36cd1b6223..3386eef47b 100644 --- a/res/trainers/data/lass_madeline.json +++ b/res/trainers/data/lass_madeline.json @@ -14,7 +14,7 @@ "level": 8, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_madeline_rematch_1.json b/res/trainers/data/lass_madeline_rematch_1.json index 8c3adca4e1..ea79852afb 100644 --- a/res/trainers/data/lass_madeline_rematch_1.json +++ b/res/trainers/data/lass_madeline_rematch_1.json @@ -13,7 +13,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_madeline_rematch_2.json b/res/trainers/data/lass_madeline_rematch_2.json index a9578aad04..2a0d15070c 100644 --- a/res/trainers/data/lass_madeline_rematch_2.json +++ b/res/trainers/data/lass_madeline_rematch_2.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_madeline_rematch_3.json b/res/trainers/data/lass_madeline_rematch_3.json index 0b60c2f45a..77cdc874b3 100644 --- a/res/trainers/data/lass_madeline_rematch_3.json +++ b/res/trainers/data/lass_madeline_rematch_3.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_molly.json b/res/trainers/data/lass_molly.json index a77c3c23ae..9e85d99afb 100644 --- a/res/trainers/data/lass_molly.json +++ b/res/trainers/data/lass_molly.json @@ -17,7 +17,7 @@ "MOVE_PSYBEAM", "MOVE_CONFUSE_RAY" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_natalie.json b/res/trainers/data/lass_natalie.json index 07ee236716..bba25c8584 100644 --- a/res/trainers/data/lass_natalie.json +++ b/res/trainers/data/lass_natalie.json @@ -14,7 +14,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_samantha.json b/res/trainers/data/lass_samantha.json index aff05d4efc..141d4f428f 100644 --- a/res/trainers/data/lass_samantha.json +++ b/res/trainers/data/lass_samantha.json @@ -14,7 +14,7 @@ "level": 7, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_samantha_rematch_1.json b/res/trainers/data/lass_samantha_rematch_1.json index e2d54ccb3a..7cb79f66f1 100644 --- a/res/trainers/data/lass_samantha_rematch_1.json +++ b/res/trainers/data/lass_samantha_rematch_1.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_samantha_rematch_2.json b/res/trainers/data/lass_samantha_rematch_2.json index d79fe2a4bd..c7ef34feb9 100644 --- a/res/trainers/data/lass_samantha_rematch_2.json +++ b/res/trainers/data/lass_samantha_rematch_2.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_samantha_rematch_3.json b/res/trainers/data/lass_samantha_rematch_3.json index 8887326d40..47090829ad 100644 --- a/res/trainers/data/lass_samantha_rematch_3.json +++ b/res/trainers/data/lass_samantha_rematch_3.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/lass_sarah.json b/res/trainers/data/lass_sarah.json index b48d123f3a..e71573cca7 100644 --- a/res/trainers/data/lass_sarah.json +++ b/res/trainers/data/lass_sarah.json @@ -14,7 +14,7 @@ "level": 7, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_byron.json b/res/trainers/data/leader_byron.json index 2e9c6232be..53c6f8d967 100644 --- a/res/trainers/data/leader_byron.json +++ b/res/trainers/data/leader_byron.json @@ -23,7 +23,7 @@ "MOVE_TRI_ATTACK", "MOVE_METAL_SOUND" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_EARTHQUAKE", "MOVE_SANDSTORM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_IRON_DEFENSE", "MOVE_TAUNT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_byron_rematch.json b/res/trainers/data/leader_byron_rematch.json index 578a23263a..00f3d7232b 100644 --- a/res/trainers/data/leader_byron_rematch.json +++ b/res/trainers/data/leader_byron_rematch.json @@ -23,7 +23,7 @@ "MOVE_ROCK_TOMB", "MOVE_STEALTH_ROCK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_DRAGON_BREATH", "MOVE_SANDSTORM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_SUPERSONIC", "MOVE_THUNDER_WAVE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_IRON_DEFENSE", "MOVE_REST" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_EARTHQUAKE", "MOVE_AVALANCHE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_candice.json b/res/trainers/data/leader_candice.json index a5337f74f9..01b61873a6 100644 --- a/res/trainers/data/leader_candice.json +++ b/res/trainers/data/leader_candice.json @@ -23,7 +23,7 @@ "MOVE_FAINT_ATTACK", "MOVE_ICE_SHARD" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_EARTHQUAKE", "MOVE_HAIL" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_WATER_PULSE", "MOVE_FOCUS_BLAST" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_SHADOW_BALL", "MOVE_PSYCHIC" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_candice_rematch.json b/res/trainers/data/leader_candice_rematch.json index 29d0486db9..1201bce7c8 100644 --- a/res/trainers/data/leader_candice_rematch.json +++ b/res/trainers/data/leader_candice_rematch.json @@ -23,7 +23,7 @@ "MOVE_FAINT_ATTACK", "MOVE_TAUNT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_EARTHQUAKE", "MOVE_HAIL" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_GRASS_WHISTLE", "MOVE_INGRAIN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_OMINOUS_WIND", "MOVE_HAIL" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_SHADOW_BALL", "MOVE_WATER_PULSE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_fantina.json b/res/trainers/data/leader_fantina.json index b27206f852..73634a1bd1 100644 --- a/res/trainers/data/leader_fantina.json +++ b/res/trainers/data/leader_fantina.json @@ -23,7 +23,7 @@ "MOVE_SHADOW_SNEAK", "MOVE_FUTURE_SIGHT" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_HYPNOSIS", "MOVE_CONFUSE_RAY" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_MAGICAL_LEAF", "MOVE_CONFUSE_RAY" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_fantina_rematch.json b/res/trainers/data/leader_fantina_rematch.json index c10f8918f4..11ae6de1c3 100644 --- a/res/trainers/data/leader_fantina_rematch.json +++ b/res/trainers/data/leader_fantina_rematch.json @@ -23,7 +23,7 @@ "MOVE_THUNDERBOLT", "MOVE_WILL_O_WISP" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_SILVER_WIND", "MOVE_BATON_PASS" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_DOUBLE_TEAM", "MOVE_PROTECT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_MAGICAL_LEAF", "MOVE_THUNDERBOLT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_FOCUS_BLAST", "MOVE_THUNDER" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_gardenia.json b/res/trainers/data/leader_gardenia.json index ab2e7374ba..2629966475 100644 --- a/res/trainers/data/leader_gardenia.json +++ b/res/trainers/data/leader_gardenia.json @@ -23,7 +23,7 @@ "MOVE_SUNNY_DAY", "MOVE_REFLECT" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_MAGICAL_LEAF", "MOVE_SAFEGUARD" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_POISON_STING", "MOVE_STUN_SPORE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_gardenia_rematch.json b/res/trainers/data/leader_gardenia_rematch.json index 5f012dc643..7e18929bca 100644 --- a/res/trainers/data/leader_gardenia_rematch.json +++ b/res/trainers/data/leader_gardenia_rematch.json @@ -23,7 +23,7 @@ "MOVE_SUNNY_DAY", "MOVE_BOUNCE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_SUNNY_DAY", "MOVE_LEECH_SEED" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_INGRAIN", "MOVE_SUNNY_DAY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_EARTHQUAKE", "MOVE_STONE_EDGE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_SLUDGE_BOMB", "MOVE_HYPER_BEAM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_maylene.json b/res/trainers/data/leader_maylene.json index 9e3856c7e9..92c3543768 100644 --- a/res/trainers/data/leader_maylene.json +++ b/res/trainers/data/leader_maylene.json @@ -20,7 +20,7 @@ "MOVE_ROCK_TOMB", "MOVE_FAKE_OUT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_STRENGTH", "MOVE_FOCUS_ENERGY" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_METAL_CLAW", "MOVE_BONE_RUSH" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_maylene_rematch.json b/res/trainers/data/leader_maylene_rematch.json index c7628d5543..8139aa743b 100644 --- a/res/trainers/data/leader_maylene_rematch.json +++ b/res/trainers/data/leader_maylene_rematch.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_FAKE_OUT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_THUNDER_PUNCH", "MOVE_HI_JUMP_KICK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_MACH_PUNCH", "MOVE_SEED_BOMB" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_EARTHQUAKE", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_EXTREME_SPEED", "MOVE_BONE_RUSH" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_roark.json b/res/trainers/data/leader_roark.json index 4a6ac600da..5411907261 100644 --- a/res/trainers/data/leader_roark.json +++ b/res/trainers/data/leader_roark.json @@ -21,7 +21,7 @@ "MOVE_STEALTH_ROCK", "MOVE_ROCK_THROW" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ROCK_THROW", "MOVE_SCREECH" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -47,7 +47,7 @@ "MOVE_PURSUIT", "MOVE_LEER" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_roark_rematch.json b/res/trainers/data/leader_roark_rematch.json index c94aa5ee98..af591be38f 100644 --- a/res/trainers/data/leader_roark_rematch.json +++ b/res/trainers/data/leader_roark_rematch.json @@ -23,7 +23,7 @@ "MOVE_EARTHQUAKE", "MOVE_DRAGON_CLAW" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_DISCHARGE", "MOVE_STONE_EDGE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_BRICK_BREAK", "MOVE_FLAMETHROWER" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_AVALANCHE", "MOVE_EARTHQUAKE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_AERIAL_ACE", "MOVE_FIRE_FANG" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_volkner.json b/res/trainers/data/leader_volkner.json index bd842d9622..21f98a724d 100644 --- a/res/trainers/data/leader_volkner.json +++ b/res/trainers/data/leader_volkner.json @@ -23,7 +23,7 @@ "MOVE_IRON_TAIL", "MOVE_QUICK_ATTACK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_SIGNAL_BEAM", "MOVE_QUICK_ATTACK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_CRUNCH", "MOVE_FIRE_FANG" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_QUICK_ATTACK", "MOVE_GIGA_IMPACT" ], - "power": 2500, + "iv_scale": 2500, "ball_seal": 14 } ], diff --git a/res/trainers/data/leader_volkner_fight_area.json b/res/trainers/data/leader_volkner_fight_area.json index cf57659f81..b5239bb869 100644 --- a/res/trainers/data/leader_volkner_fight_area.json +++ b/res/trainers/data/leader_volkner_fight_area.json @@ -23,7 +23,7 @@ "MOVE_CRUNCH", "MOVE_FIRE_FANG" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_DOUBLE_KICK", "MOVE_QUICK_ATTACK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_BRICK_BREAK", "MOVE_GIGA_IMPACT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 14 } ], diff --git a/res/trainers/data/leader_volkner_rematch.json b/res/trainers/data/leader_volkner_rematch.json index 352e3372bf..50b60c15d6 100644 --- a/res/trainers/data/leader_volkner_rematch.json +++ b/res/trainers/data/leader_volkner_rematch.json @@ -23,7 +23,7 @@ "MOVE_DOUBLE_KICK", "MOVE_QUICK_ATTACK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_THUNDER_WAVE", "MOVE_LIGHT_SCREEN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_CRUNCH", "MOVE_FIRE_FANG" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_SURF", "MOVE_ICE_BEAM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_BRICK_BREAK", "MOVE_GIGA_IMPACT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 14 } ], diff --git a/res/trainers/data/leader_wake.json b/res/trainers/data/leader_wake.json index ca3481c698..ec9404d338 100644 --- a/res/trainers/data/leader_wake.json +++ b/res/trainers/data/leader_wake.json @@ -23,7 +23,7 @@ "MOVE_BITE", "MOVE_TWISTER" ], - "power": 150, + "iv_scale": 150, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_WATER_PULSE", "MOVE_YAWN" ], - "power": 150, + "iv_scale": 150, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_CRUNCH", "MOVE_AQUA_JET" ], - "power": 150, + "iv_scale": 150, "ball_seal": 0 } ], diff --git a/res/trainers/data/leader_wake_rematch.json b/res/trainers/data/leader_wake_rematch.json index 27bda2b792..92f0e5d317 100644 --- a/res/trainers/data/leader_wake_rematch.json +++ b/res/trainers/data/leader_wake_rematch.json @@ -23,7 +23,7 @@ "MOVE_SLASH", "MOVE_ENDURE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_YAWN", "MOVE_SURF" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_BITE", "MOVE_GIGA_IMPACT" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_CRUNCH", "MOVE_AQUA_JET" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_ENERGY_BALL", "MOVE_FOCUS_BLAST" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/lucas_jubilife_city_chimchar.json b/res/trainers/data/lucas_jubilife_city_chimchar.json index 4cf160a8f5..a9ce1df76a 100644 --- a/res/trainers/data/lucas_jubilife_city_chimchar.json +++ b/res/trainers/data/lucas_jubilife_city_chimchar.json @@ -20,7 +20,7 @@ "MOVE_ABSORB", "MOVE_TACKLE" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/lucas_jubilife_city_piplup.json b/res/trainers/data/lucas_jubilife_city_piplup.json index 3bbaa8c177..a51ec0894f 100644 --- a/res/trainers/data/lucas_jubilife_city_piplup.json +++ b/res/trainers/data/lucas_jubilife_city_piplup.json @@ -20,7 +20,7 @@ "MOVE_EMBER", "MOVE_SCRATCH" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/lucas_jubilife_city_turtwig.json b/res/trainers/data/lucas_jubilife_city_turtwig.json index 4992da7657..2bd66ca27d 100644 --- a/res/trainers/data/lucas_jubilife_city_turtwig.json +++ b/res/trainers/data/lucas_jubilife_city_turtwig.json @@ -20,7 +20,7 @@ "MOVE_BUBBLE", "MOVE_POUND" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/lucas_veilstone_city_chimchar.json b/res/trainers/data/lucas_veilstone_city_chimchar.json index 5b34707452..dd13d99ec6 100644 --- a/res/trainers/data/lucas_veilstone_city_chimchar.json +++ b/res/trainers/data/lucas_veilstone_city_chimchar.json @@ -20,7 +20,7 @@ "MOVE_WAKE_UP_SLAP", "MOVE_SING" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_BITE", "MOVE_CURSE" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/lucas_veilstone_city_piplup.json b/res/trainers/data/lucas_veilstone_city_piplup.json index d074e283c0..c0075d5c88 100644 --- a/res/trainers/data/lucas_veilstone_city_piplup.json +++ b/res/trainers/data/lucas_veilstone_city_piplup.json @@ -20,7 +20,7 @@ "MOVE_WAKE_UP_SLAP", "MOVE_SING" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_FURY_SWIPES", "MOVE_TORMENT" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/lucas_veilstone_city_turtwig.json b/res/trainers/data/lucas_veilstone_city_turtwig.json index e4d0b21e24..7a503a3fe7 100644 --- a/res/trainers/data/lucas_veilstone_city_turtwig.json +++ b/res/trainers/data/lucas_veilstone_city_turtwig.json @@ -20,7 +20,7 @@ "MOVE_WAKE_UP_SLAP", "MOVE_SING" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_REFLECT", "MOVE_LIGHT_SCREEN" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_PECK", "MOVE_GROWL" ], - "power": 60, + "iv_scale": 60, "ball_seal": 0 } ], diff --git a/res/trainers/data/maid_belinda.json b/res/trainers/data/maid_belinda.json index 6234081d3d..a1eb1c1a81 100644 --- a/res/trainers/data/maid_belinda.json +++ b/res/trainers/data/maid_belinda.json @@ -18,7 +18,7 @@ "MOVE_METEOR_MASH", "MOVE_ENDURE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/maid_clare.json b/res/trainers/data/maid_clare.json index 159e387fd3..e4125a79e7 100644 --- a/res/trainers/data/maid_clare.json +++ b/res/trainers/data/maid_clare.json @@ -18,7 +18,7 @@ "MOVE_METEOR_MASH", "MOVE_ENDURE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/maid_elena.json b/res/trainers/data/maid_elena.json index a8c44d62a6..bae6da96b8 100644 --- a/res/trainers/data/maid_elena.json +++ b/res/trainers/data/maid_elena.json @@ -18,7 +18,7 @@ "MOVE_METEOR_MASH", "MOVE_ENDURE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/maid_emily.json b/res/trainers/data/maid_emily.json index 41871fac29..15061fe6b0 100644 --- a/res/trainers/data/maid_emily.json +++ b/res/trainers/data/maid_emily.json @@ -18,7 +18,7 @@ "MOVE_METEOR_MASH", "MOVE_ENDURE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/maid_sophie.json b/res/trainers/data/maid_sophie.json index 877c4a14cf..d63b2027fd 100644 --- a/res/trainers/data/maid_sophie.json +++ b/res/trainers/data/maid_sophie.json @@ -18,7 +18,7 @@ "MOVE_METEOR_MASH", "MOVE_ENDURE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/marley_battleground.json b/res/trainers/data/marley_battleground.json index 827eba0f4e..6938cde70d 100644 --- a/res/trainers/data/marley_battleground.json +++ b/res/trainers/data/marley_battleground.json @@ -23,7 +23,7 @@ "MOVE_SWORDS_DANCE", "MOVE_SLASH" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_THUNDER_WAVE", "MOVE_DOUBLE_TEAM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_CONFUSE_RAY", "MOVE_DOUBLE_TEAM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_ICE_PUNCH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_CRUNCH", "MOVE_THUNDER_FANG" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/marley_victory_road.json b/res/trainers/data/marley_victory_road.json index fefcdc899b..26cae4e5c7 100644 --- a/res/trainers/data/marley_victory_road.json +++ b/res/trainers/data/marley_victory_road.json @@ -20,7 +20,7 @@ "MOVE_HELPING_HAND", "MOVE_AGILITY" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/mira_battleground.json b/res/trainers/data/mira_battleground.json index 0355ea2d6c..94e5b95ba8 100644 --- a/res/trainers/data/mira_battleground.json +++ b/res/trainers/data/mira_battleground.json @@ -23,7 +23,7 @@ "MOVE_THUNDERBOLT", "MOVE_DARK_PULSE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_SLUDGE_BOMB", "MOVE_ENERGY_BALL" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_THUNDER_WAVE", "MOVE_HYPER_BEAM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_AURA_SPHERE", "MOVE_PSYCHIC" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_CALM_MIND", "MOVE_HYPER_BEAM" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/mira_wayward_cave.json b/res/trainers/data/mira_wayward_cave.json index 930dbe1481..df8f951d4d 100644 --- a/res/trainers/data/mira_wayward_cave.json +++ b/res/trainers/data/mira_wayward_cave.json @@ -20,7 +20,7 @@ "MOVE_FLASH", "MOVE_KINESIS" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_brennan.json b/res/trainers/data/ninja_boy_brennan.json index 95d7db7be0..90af53b2b8 100644 --- a/res/trainers/data/ninja_boy_brennan.json +++ b/res/trainers/data/ninja_boy_brennan.json @@ -13,7 +13,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_bruce.json b/res/trainers/data/ninja_boy_bruce.json index db3571b5a1..1d847095bc 100644 --- a/res/trainers/data/ninja_boy_bruce.json +++ b/res/trainers/data/ninja_boy_bruce.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_davido.json b/res/trainers/data/ninja_boy_davido.json index 35fa4aee15..8395713bdf 100644 --- a/res/trainers/data/ninja_boy_davido.json +++ b/res/trainers/data/ninja_boy_davido.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_ethan.json b/res/trainers/data/ninja_boy_ethan.json index 6369fabc63..4996ed46ee 100644 --- a/res/trainers/data/ninja_boy_ethan.json +++ b/res/trainers/data/ninja_boy_ethan.json @@ -13,7 +13,7 @@ "level": 37, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 37, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_fabian.json b/res/trainers/data/ninja_boy_fabian.json index fa7e64c240..e965f82d4d 100644 --- a/res/trainers/data/ninja_boy_fabian.json +++ b/res/trainers/data/ninja_boy_fabian.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_joel.json b/res/trainers/data/ninja_boy_joel.json index 5c0f6b3ee5..b2d1e10c79 100644 --- a/res/trainers/data/ninja_boy_joel.json +++ b/res/trainers/data/ninja_boy_joel.json @@ -13,7 +13,7 @@ "level": 29, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 29, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 29, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 29, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_matthew.json b/res/trainers/data/ninja_boy_matthew.json index adbff8c9da..250a2698bf 100644 --- a/res/trainers/data/ninja_boy_matthew.json +++ b/res/trainers/data/ninja_boy_matthew.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 5 } ], diff --git a/res/trainers/data/ninja_boy_nathan.json b/res/trainers/data/ninja_boy_nathan.json index 0e93b6c235..8771887793 100644 --- a/res/trainers/data/ninja_boy_nathan.json +++ b/res/trainers/data/ninja_boy_nathan.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_nick.json b/res/trainers/data/ninja_boy_nick.json index 280da4b432..332b8d9cb5 100644 --- a/res/trainers/data/ninja_boy_nick.json +++ b/res/trainers/data/ninja_boy_nick.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 25 } ], diff --git a/res/trainers/data/ninja_boy_zach.json b/res/trainers/data/ninja_boy_zach.json index 6b56c96a36..8236dc25bc 100644 --- a/res/trainers/data/ninja_boy_zach.json +++ b/res/trainers/data/ninja_boy_zach.json @@ -13,7 +13,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 14, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_zach_rematch_1.json b/res/trainers/data/ninja_boy_zach_rematch_1.json index 9e84c2dc67..b44d3822a7 100644 --- a/res/trainers/data/ninja_boy_zach_rematch_1.json +++ b/res/trainers/data/ninja_boy_zach_rematch_1.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_zach_rematch_2.json b/res/trainers/data/ninja_boy_zach_rematch_2.json index 1ce6af4579..4cc95e8901 100644 --- a/res/trainers/data/ninja_boy_zach_rematch_2.json +++ b/res/trainers/data/ninja_boy_zach_rematch_2.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ninja_boy_zach_rematch_3.json b/res/trainers/data/ninja_boy_zach_rematch_3.json index 8ba4b61115..0c9ec8100a 100644 --- a/res/trainers/data/ninja_boy_zach_rematch_3.json +++ b/res/trainers/data/ninja_boy_zach_rematch_3.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/parasol_lady_alexa.json b/res/trainers/data/parasol_lady_alexa.json index ce637ff34a..646963ccfb 100644 --- a/res/trainers/data/parasol_lady_alexa.json +++ b/res/trainers/data/parasol_lady_alexa.json @@ -13,7 +13,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/parasol_lady_alexa_rematch_1.json b/res/trainers/data/parasol_lady_alexa_rematch_1.json index 3cfa3688ff..101155b648 100644 --- a/res/trainers/data/parasol_lady_alexa_rematch_1.json +++ b/res/trainers/data/parasol_lady_alexa_rematch_1.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/parasol_lady_alexa_rematch_2.json b/res/trainers/data/parasol_lady_alexa_rematch_2.json index 294d1a8783..b804f9ffe3 100644 --- a/res/trainers/data/parasol_lady_alexa_rematch_2.json +++ b/res/trainers/data/parasol_lady_alexa_rematch_2.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/parasol_lady_alexa_rematch_3.json b/res/trainers/data/parasol_lady_alexa_rematch_3.json index 3461b64b92..8609af847a 100644 --- a/res/trainers/data/parasol_lady_alexa_rematch_3.json +++ b/res/trainers/data/parasol_lady_alexa_rematch_3.json @@ -13,7 +13,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/parasol_lady_sabrina.json b/res/trainers/data/parasol_lady_sabrina.json index 9bb1522574..53fb2b7bd8 100644 --- a/res/trainers/data/parasol_lady_sabrina.json +++ b/res/trainers/data/parasol_lady_sabrina.json @@ -13,7 +13,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 28, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/pi_carlos.json b/res/trainers/data/pi_carlos.json index 87e78b3287..6b859969f6 100644 --- a/res/trainers/data/pi_carlos.json +++ b/res/trainers/data/pi_carlos.json @@ -17,7 +17,7 @@ "MOVE_HORN_DRILL", "MOVE_FLAIL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/pi_carlos_rematch_1.json b/res/trainers/data/pi_carlos_rematch_1.json index d73604f800..24f2e4004c 100644 --- a/res/trainers/data/pi_carlos_rematch_1.json +++ b/res/trainers/data/pi_carlos_rematch_1.json @@ -17,7 +17,7 @@ "MOVE_HORN_DRILL", "MOVE_FLAIL" ], - "power": 150, + "iv_scale": 150, "ball_seal": 0 } ], diff --git a/res/trainers/data/pi_carlos_rematch_2.json b/res/trainers/data/pi_carlos_rematch_2.json index ecb75cae0b..99b1767e36 100644 --- a/res/trainers/data/pi_carlos_rematch_2.json +++ b/res/trainers/data/pi_carlos_rematch_2.json @@ -17,7 +17,7 @@ "MOVE_HORN_DRILL", "MOVE_FLAIL" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 } ], diff --git a/res/trainers/data/pi_kendrick.json b/res/trainers/data/pi_kendrick.json index 3e9b200cd8..06f8ade2d5 100644 --- a/res/trainers/data/pi_kendrick.json +++ b/res/trainers/data/pi_kendrick.json @@ -17,7 +17,7 @@ "MOVE_HORN_DRILL", "MOVE_REVERSAL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_ana.json b/res/trainers/data/picnicker_ana.json index 5a7558e081..5ac604c5f0 100644 --- a/res/trainers/data/picnicker_ana.json +++ b/res/trainers/data/picnicker_ana.json @@ -15,7 +15,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_cheyenne.json b/res/trainers/data/picnicker_cheyenne.json index ccc43040cf..8553136aa9 100644 --- a/res/trainers/data/picnicker_cheyenne.json +++ b/res/trainers/data/picnicker_cheyenne.json @@ -19,7 +19,7 @@ "MOVE_SWALLOW", "MOVE_STOCKPILE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_ASTONISH", "MOVE_CONFUSE_RAY" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_diana.json b/res/trainers/data/picnicker_diana.json index fd86844f92..b236141932 100644 --- a/res/trainers/data/picnicker_diana.json +++ b/res/trainers/data/picnicker_diana.json @@ -15,7 +15,7 @@ "level": 9, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_karina.json b/res/trainers/data/picnicker_karina.json index 930853c217..6d775db86d 100644 --- a/res/trainers/data/picnicker_karina.json +++ b/res/trainers/data/picnicker_karina.json @@ -18,7 +18,7 @@ "MOVE_BUBBLE", "MOVE_PECK" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_karina_rematch_1.json b/res/trainers/data/picnicker_karina_rematch_1.json index e05685b1b5..d87da1e850 100644 --- a/res/trainers/data/picnicker_karina_rematch_1.json +++ b/res/trainers/data/picnicker_karina_rematch_1.json @@ -20,7 +20,7 @@ "MOVE_POUND", "MOVE_GROWL" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_karina_rematch_2.json b/res/trainers/data/picnicker_karina_rematch_2.json index 9d88384836..918f826f37 100644 --- a/res/trainers/data/picnicker_karina_rematch_2.json +++ b/res/trainers/data/picnicker_karina_rematch_2.json @@ -20,7 +20,7 @@ "MOVE_FURY_ATTACK", "MOVE_GROWL" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_karina_rematch_3.json b/res/trainers/data/picnicker_karina_rematch_3.json index 01bafffdd4..6c07c9dd45 100644 --- a/res/trainers/data/picnicker_karina_rematch_3.json +++ b/res/trainers/data/picnicker_karina_rematch_3.json @@ -20,7 +20,7 @@ "MOVE_METAL_CLAW", "MOVE_AQUA_JET" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_lauren.json b/res/trainers/data/picnicker_lauren.json index fc3c7f4d3c..a5ffc4ef6d 100644 --- a/res/trainers/data/picnicker_lauren.json +++ b/res/trainers/data/picnicker_lauren.json @@ -19,7 +19,7 @@ "MOVE_QUICK_ATTACK", "MOVE_CHARM" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_siena.json b/res/trainers/data/picnicker_siena.json index 22ea00af59..ef46bb5b9c 100644 --- a/res/trainers/data/picnicker_siena.json +++ b/res/trainers/data/picnicker_siena.json @@ -15,7 +15,7 @@ "level": 12, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 12, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_summer.json b/res/trainers/data/picnicker_summer.json index 72643ce360..65fe65a3f5 100644 --- a/res/trainers/data/picnicker_summer.json +++ b/res/trainers/data/picnicker_summer.json @@ -15,7 +15,7 @@ "level": 37, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/picnicker_tori.json b/res/trainers/data/picnicker_tori.json index 4e5c30f761..c310bce132 100644 --- a/res/trainers/data/picnicker_tori.json +++ b/res/trainers/data/picnicker_tori.json @@ -15,7 +15,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_ariel.json b/res/trainers/data/poke_kid_ariel.json index 6ce1c5e25a..5e184331b4 100644 --- a/res/trainers/data/poke_kid_ariel.json +++ b/res/trainers/data/poke_kid_ariel.json @@ -13,7 +13,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_ariel_rematch_1.json b/res/trainers/data/poke_kid_ariel_rematch_1.json index 06793c387a..be22aa39a0 100644 --- a/res/trainers/data/poke_kid_ariel_rematch_1.json +++ b/res/trainers/data/poke_kid_ariel_rematch_1.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_ariel_rematch_2.json b/res/trainers/data/poke_kid_ariel_rematch_2.json index a597d2ff3a..e72b30344a 100644 --- a/res/trainers/data/poke_kid_ariel_rematch_2.json +++ b/res/trainers/data/poke_kid_ariel_rematch_2.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_ariel_rematch_3.json b/res/trainers/data/poke_kid_ariel_rematch_3.json index 857c278d8c..0f9dfc4a9a 100644 --- a/res/trainers/data/poke_kid_ariel_rematch_3.json +++ b/res/trainers/data/poke_kid_ariel_rematch_3.json @@ -13,7 +13,7 @@ "level": 49, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 49, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 49, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_ariel_rematch_4.json b/res/trainers/data/poke_kid_ariel_rematch_4.json index 51a1e34ecc..4fb95323eb 100644 --- a/res/trainers/data/poke_kid_ariel_rematch_4.json +++ b/res/trainers/data/poke_kid_ariel_rematch_4.json @@ -13,7 +13,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_ariel_unused.json b/res/trainers/data/poke_kid_ariel_unused.json index 55dfb78666..6bc8c7c953 100644 --- a/res/trainers/data/poke_kid_ariel_unused.json +++ b/res/trainers/data/poke_kid_ariel_unused.json @@ -13,7 +13,7 @@ "level": 3, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 3, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 3, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_danielle.json b/res/trainers/data/poke_kid_danielle.json index d1ba717ce1..030ff66999 100644 --- a/res/trainers/data/poke_kid_danielle.json +++ b/res/trainers/data/poke_kid_danielle.json @@ -13,7 +13,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_danielle_rematch_1.json b/res/trainers/data/poke_kid_danielle_rematch_1.json index 34ee01abba..b83e55462a 100644 --- a/res/trainers/data/poke_kid_danielle_rematch_1.json +++ b/res/trainers/data/poke_kid_danielle_rematch_1.json @@ -13,7 +13,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_danielle_rematch_2.json b/res/trainers/data/poke_kid_danielle_rematch_2.json index bb5debe753..ef98867334 100644 --- a/res/trainers/data/poke_kid_danielle_rematch_2.json +++ b/res/trainers/data/poke_kid_danielle_rematch_2.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_danielle_rematch_3.json b/res/trainers/data/poke_kid_danielle_rematch_3.json index 252944839e..3fe915a71d 100644 --- a/res/trainers/data/poke_kid_danielle_rematch_3.json +++ b/res/trainers/data/poke_kid_danielle_rematch_3.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_janet.json b/res/trainers/data/poke_kid_janet.json index b9ebac6fd5..79308e4509 100644 --- a/res/trainers/data/poke_kid_janet.json +++ b/res/trainers/data/poke_kid_janet.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/poke_kid_meghan.json b/res/trainers/data/poke_kid_meghan.json index 9a02aa6b1c..c423415f80 100644 --- a/res/trainers/data/poke_kid_meghan.json +++ b/res/trainers/data/poke_kid_meghan.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 42, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 42, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/pokefan_leonard.json b/res/trainers/data/pokefan_leonard.json index 144e065572..0f7a3129eb 100644 --- a/res/trainers/data/pokefan_leonard.json +++ b/res/trainers/data/pokefan_leonard.json @@ -16,7 +16,7 @@ "level": 19, "item": "ITEM_SITRUS_BERRY", "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -25,7 +25,7 @@ "level": 19, "item": "ITEM_SITRUS_BERRY", "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "level": 22, "item": "ITEM_SITRUS_BERRY", "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 7 } ], diff --git a/res/trainers/data/pokefan_meredith.json b/res/trainers/data/pokefan_meredith.json index 367a437ce7..7d9b2133c3 100644 --- a/res/trainers/data/pokefan_meredith.json +++ b/res/trainers/data/pokefan_meredith.json @@ -13,7 +13,7 @@ "level": 26, "item": "ITEM_SITRUS_BERRY", "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 26, "item": "ITEM_SITRUS_BERRY", "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/pokefan_rebekah.json b/res/trainers/data/pokefan_rebekah.json index fbd0d8072c..93f1c94a3c 100644 --- a/res/trainers/data/pokefan_rebekah.json +++ b/res/trainers/data/pokefan_rebekah.json @@ -16,7 +16,7 @@ "level": 23, "item": "ITEM_SITRUS_BERRY", "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 6 } ], diff --git a/res/trainers/data/policeman_alex.json b/res/trainers/data/policeman_alex.json index e7ff7dcb3a..397409d000 100644 --- a/res/trainers/data/policeman_alex.json +++ b/res/trainers/data/policeman_alex.json @@ -13,7 +13,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/policeman_bobby.json b/res/trainers/data/policeman_bobby.json index a658cbcb86..e361ba1f93 100644 --- a/res/trainers/data/policeman_bobby.json +++ b/res/trainers/data/policeman_bobby.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/policeman_caleb.json b/res/trainers/data/policeman_caleb.json index e4a498c661..7a606ee702 100644 --- a/res/trainers/data/policeman_caleb.json +++ b/res/trainers/data/policeman_caleb.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/policeman_danny.json b/res/trainers/data/policeman_danny.json index 1ac16184fd..e297a00cdc 100644 --- a/res/trainers/data/policeman_danny.json +++ b/res/trainers/data/policeman_danny.json @@ -13,7 +13,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 28, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/policeman_danny_rematch_1.json b/res/trainers/data/policeman_danny_rematch_1.json index 1477253dd7..0a234e6583 100644 --- a/res/trainers/data/policeman_danny_rematch_1.json +++ b/res/trainers/data/policeman_danny_rematch_1.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/policeman_danny_rematch_2.json b/res/trainers/data/policeman_danny_rematch_2.json index a034deea0c..d7d2b14ada 100644 --- a/res/trainers/data/policeman_danny_rematch_2.json +++ b/res/trainers/data/policeman_danny_rematch_2.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/policeman_danny_rematch_3.json b/res/trainers/data/policeman_danny_rematch_3.json index 01bd56ad04..04d3d18a40 100644 --- a/res/trainers/data/policeman_danny_rematch_3.json +++ b/res/trainers/data/policeman_danny_rematch_3.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/policeman_dylan.json b/res/trainers/data/policeman_dylan.json index 7cf0917741..b3c1ec4a71 100644 --- a/res/trainers/data/policeman_dylan.json +++ b/res/trainers/data/policeman_dylan.json @@ -13,7 +13,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/policeman_thomas.json b/res/trainers/data/policeman_thomas.json index 2ff64b768c..7d4c706b2c 100644 --- a/res/trainers/data/policeman_thomas.json +++ b/res/trainers/data/policeman_thomas.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_abigail.json b/res/trainers/data/psychic_abigail.json index e9bc356a23..ef8965a078 100644 --- a/res/trainers/data/psychic_abigail.json +++ b/res/trainers/data/psychic_abigail.json @@ -14,7 +14,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_abigail_rematch_1.json b/res/trainers/data/psychic_abigail_rematch_1.json index 69a5619c1c..6991e16bdd 100644 --- a/res/trainers/data/psychic_abigail_rematch_1.json +++ b/res/trainers/data/psychic_abigail_rematch_1.json @@ -14,7 +14,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_abigail_rematch_2.json b/res/trainers/data/psychic_abigail_rematch_2.json index 12a06288c8..19502cf48f 100644 --- a/res/trainers/data/psychic_abigail_rematch_2.json +++ b/res/trainers/data/psychic_abigail_rematch_2.json @@ -14,7 +14,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 61, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_brittney.json b/res/trainers/data/psychic_brittney.json index d01d264183..1f5362aaa5 100644 --- a/res/trainers/data/psychic_brittney.json +++ b/res/trainers/data/psychic_brittney.json @@ -14,7 +14,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_brittney_rematch.json b/res/trainers/data/psychic_brittney_rematch.json index 1687e441b9..0bbc41dd8e 100644 --- a/res/trainers/data/psychic_brittney_rematch.json +++ b/res/trainers/data/psychic_brittney_rematch.json @@ -19,7 +19,7 @@ "MOVE_SHADOW_BALL", "MOVE_DREAM_EATER" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_CALM_MIND", "MOVE_SHADOW_BALL" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_bryce.json b/res/trainers/data/psychic_bryce.json index 940f40eba3..66bc46e40f 100644 --- a/res/trainers/data/psychic_bryce.json +++ b/res/trainers/data/psychic_bryce.json @@ -14,7 +14,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 46, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 46, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_chelsey.json b/res/trainers/data/psychic_chelsey.json index 27bb090d3e..377f8cbb75 100644 --- a/res/trainers/data/psychic_chelsey.json +++ b/res/trainers/data/psychic_chelsey.json @@ -14,7 +14,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_corbin.json b/res/trainers/data/psychic_corbin.json index 366dfe43ef..ed64125094 100644 --- a/res/trainers/data/psychic_corbin.json +++ b/res/trainers/data/psychic_corbin.json @@ -14,7 +14,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_corbin_rematch.json b/res/trainers/data/psychic_corbin_rematch.json index f1a2c5a3a5..22c6179f1d 100644 --- a/res/trainers/data/psychic_corbin_rematch.json +++ b/res/trainers/data/psychic_corbin_rematch.json @@ -14,7 +14,7 @@ "level": 60, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 60, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_daisy.json b/res/trainers/data/psychic_daisy.json index db9183c934..3f0b00180d 100644 --- a/res/trainers/data/psychic_daisy.json +++ b/res/trainers/data/psychic_daisy.json @@ -14,7 +14,7 @@ "level": 52, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_daisy_rematch.json b/res/trainers/data/psychic_daisy_rematch.json index 987bd355ee..e3fa94b7e5 100644 --- a/res/trainers/data/psychic_daisy_rematch.json +++ b/res/trainers/data/psychic_daisy_rematch.json @@ -14,7 +14,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 62, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_deandre.json b/res/trainers/data/psychic_deandre.json index b66c14d440..20594cf1f5 100644 --- a/res/trainers/data/psychic_deandre.json +++ b/res/trainers/data/psychic_deandre.json @@ -19,7 +19,7 @@ "MOVE_ICE_PUNCH", "MOVE_THUNDER_PUNCH" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_desiree.json b/res/trainers/data/psychic_desiree.json index 6d88fa57d8..9535acce2a 100644 --- a/res/trainers/data/psychic_desiree.json +++ b/res/trainers/data/psychic_desiree.json @@ -19,7 +19,7 @@ "MOVE_LIGHT_SCREEN", "MOVE_DRAIN_PUNCH" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_AERIAL_ACE", "MOVE_SHOCK_WAVE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_elijah.json b/res/trainers/data/psychic_elijah.json index efd6292e7c..555261720f 100644 --- a/res/trainers/data/psychic_elijah.json +++ b/res/trainers/data/psychic_elijah.json @@ -16,7 +16,7 @@ "moves": [ "MOVE_HIDDEN_POWER" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_kendra.json b/res/trainers/data/psychic_kendra.json index 4213651f61..cf6bad49fc 100644 --- a/res/trainers/data/psychic_kendra.json +++ b/res/trainers/data/psychic_kendra.json @@ -19,7 +19,7 @@ "MOVE_ENERGY_BALL", "MOVE_CHARGE_BEAM" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_CONFUSE_RAY", "MOVE_TOXIC" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -47,7 +47,7 @@ "MOVE_FRUSTRATION", "MOVE_SLUDGE_BOMB" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_kody.json b/res/trainers/data/psychic_kody.json index 410e2e1aa9..2854809227 100644 --- a/res/trainers/data/psychic_kody.json +++ b/res/trainers/data/psychic_kody.json @@ -18,7 +18,7 @@ "MOVE_BIDE", "MOVE_MEDITATE" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_landon.json b/res/trainers/data/psychic_landon.json index 51cc4cf746..8af42c1129 100644 --- a/res/trainers/data/psychic_landon.json +++ b/res/trainers/data/psychic_landon.json @@ -19,7 +19,7 @@ "MOVE_SUCKER_PUNCH", "MOVE_CONFUSE_RAY" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_RECOVER", "MOVE_FOCUS_BLAST" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_lindsey.json b/res/trainers/data/psychic_lindsey.json index 94a27e3a62..a504e7e567 100644 --- a/res/trainers/data/psychic_lindsey.json +++ b/res/trainers/data/psychic_lindsey.json @@ -16,7 +16,7 @@ "moves": [ "MOVE_HIDDEN_POWER" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_maxwell.json b/res/trainers/data/psychic_maxwell.json index 3a347c4511..9593f1b7a5 100644 --- a/res/trainers/data/psychic_maxwell.json +++ b/res/trainers/data/psychic_maxwell.json @@ -14,7 +14,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_maxwell_rematch.json b/res/trainers/data/psychic_maxwell_rematch.json index 95a5a63371..9ffb96800f 100644 --- a/res/trainers/data/psychic_maxwell_rematch.json +++ b/res/trainers/data/psychic_maxwell_rematch.json @@ -14,7 +14,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 62, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_mitchell.json b/res/trainers/data/psychic_mitchell.json index 273e2665cd..c667270265 100644 --- a/res/trainers/data/psychic_mitchell.json +++ b/res/trainers/data/psychic_mitchell.json @@ -14,7 +14,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_mitchell_rematch_1.json b/res/trainers/data/psychic_mitchell_rematch_1.json index 095fcef372..378ef46578 100644 --- a/res/trainers/data/psychic_mitchell_rematch_1.json +++ b/res/trainers/data/psychic_mitchell_rematch_1.json @@ -14,7 +14,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_mitchell_rematch_2.json b/res/trainers/data/psychic_mitchell_rematch_2.json index 9b6b8bf8cd..a5f8325a8d 100644 --- a/res/trainers/data/psychic_mitchell_rematch_2.json +++ b/res/trainers/data/psychic_mitchell_rematch_2.json @@ -14,7 +14,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_rachael.json b/res/trainers/data/psychic_rachael.json index ffff71691f..d8936da145 100644 --- a/res/trainers/data/psychic_rachael.json +++ b/res/trainers/data/psychic_rachael.json @@ -18,7 +18,7 @@ "MOVE_WATER_GUN", "MOVE_SCRATCH" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_sterling.json b/res/trainers/data/psychic_sterling.json index a97ac5ef3e..1f8c765fcb 100644 --- a/res/trainers/data/psychic_sterling.json +++ b/res/trainers/data/psychic_sterling.json @@ -14,7 +14,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/psychic_valencia.json b/res/trainers/data/psychic_valencia.json index 9bdf2f3c35..c2c75a4b68 100644 --- a/res/trainers/data/psychic_valencia.json +++ b/res/trainers/data/psychic_valencia.json @@ -14,7 +14,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "level": 46, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/rancher_marco.json b/res/trainers/data/rancher_marco.json index 7bb14aabbf..bd5dd7b940 100644 --- a/res/trainers/data/rancher_marco.json +++ b/res/trainers/data/rancher_marco.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/rancher_marco_rematch_1.json b/res/trainers/data/rancher_marco_rematch_1.json index 75972db7e5..5fa278ddc7 100644 --- a/res/trainers/data/rancher_marco_rematch_1.json +++ b/res/trainers/data/rancher_marco_rematch_1.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/rancher_marco_rematch_2.json b/res/trainers/data/rancher_marco_rematch_2.json index 6971071c7c..782cb89e62 100644 --- a/res/trainers/data/rancher_marco_rematch_2.json +++ b/res/trainers/data/rancher_marco_rematch_2.json @@ -13,7 +13,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_allison.json b/res/trainers/data/ranger_allison.json index 134778b975..675da8515a 100644 --- a/res/trainers/data/ranger_allison.json +++ b/res/trainers/data/ranger_allison.json @@ -15,7 +15,7 @@ "level": 29, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 29, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_allison_rematch_1.json b/res/trainers/data/ranger_allison_rematch_1.json index 859eb74eba..da9ab53f82 100644 --- a/res/trainers/data/ranger_allison_rematch_1.json +++ b/res/trainers/data/ranger_allison_rematch_1.json @@ -15,7 +15,7 @@ "level": 35, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 35, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_allison_rematch_2.json b/res/trainers/data/ranger_allison_rematch_2.json index 070a22c841..693f8acc2d 100644 --- a/res/trainers/data/ranger_allison_rematch_2.json +++ b/res/trainers/data/ranger_allison_rematch_2.json @@ -15,7 +15,7 @@ "level": 45, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 45, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_allison_rematch_3.json b/res/trainers/data/ranger_allison_rematch_3.json index 3c7d6e8a59..2caf3c8aec 100644 --- a/res/trainers/data/ranger_allison_rematch_3.json +++ b/res/trainers/data/ranger_allison_rematch_3.json @@ -15,7 +15,7 @@ "level": 61, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 61, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_ashlee.json b/res/trainers/data/ranger_ashlee.json index cad1904ac4..9ec77740b8 100644 --- a/res/trainers/data/ranger_ashlee.json +++ b/res/trainers/data/ranger_ashlee.json @@ -15,7 +15,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_ashlee_rematch.json b/res/trainers/data/ranger_ashlee_rematch.json index b09fc9d33c..0a045f7f9b 100644 --- a/res/trainers/data/ranger_ashlee_rematch.json +++ b/res/trainers/data/ranger_ashlee_rematch.json @@ -15,7 +15,7 @@ "level": 60, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 60, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 60, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_deshawn.json b/res/trainers/data/ranger_deshawn.json index b30a0ee3f3..b47c74357f 100644 --- a/res/trainers/data/ranger_deshawn.json +++ b/res/trainers/data/ranger_deshawn.json @@ -15,7 +15,7 @@ "level": 54, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 54, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 54, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_dwayne.json b/res/trainers/data/ranger_dwayne.json index ca306c18f5..dcaf9cffcb 100644 --- a/res/trainers/data/ranger_dwayne.json +++ b/res/trainers/data/ranger_dwayne.json @@ -15,7 +15,7 @@ "level": 54, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 54, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 54, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_felicia.json b/res/trainers/data/ranger_felicia.json index 6b19283a70..ec8a0411c9 100644 --- a/res/trainers/data/ranger_felicia.json +++ b/res/trainers/data/ranger_felicia.json @@ -15,7 +15,7 @@ "level": 59, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 59, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_jeffrey.json b/res/trainers/data/ranger_jeffrey.json index 96cbebb984..8aa6a6b849 100644 --- a/res/trainers/data/ranger_jeffrey.json +++ b/res/trainers/data/ranger_jeffrey.json @@ -15,7 +15,7 @@ "level": 31, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_krista.json b/res/trainers/data/ranger_krista.json index d609fea2e6..108a16d4a5 100644 --- a/res/trainers/data/ranger_krista.json +++ b/res/trainers/data/ranger_krista.json @@ -15,7 +15,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 57, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_kyler.json b/res/trainers/data/ranger_kyler.json index d1aed68bf6..b14b792619 100644 --- a/res/trainers/data/ranger_kyler.json +++ b/res/trainers/data/ranger_kyler.json @@ -15,7 +15,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 55, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 58, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_kyler_rematch.json b/res/trainers/data/ranger_kyler_rematch.json index 8cfd9097db..2541031e23 100644 --- a/res/trainers/data/ranger_kyler_rematch.json +++ b/res/trainers/data/ranger_kyler_rematch.json @@ -15,7 +15,7 @@ "level": 58, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 60, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 62, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_taylor.json b/res/trainers/data/ranger_taylor.json index ab1e0940bb..bf7cf16244 100644 --- a/res/trainers/data/ranger_taylor.json +++ b/res/trainers/data/ranger_taylor.json @@ -15,7 +15,7 @@ "level": 28, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 30, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_taylor_rematch_1.json b/res/trainers/data/ranger_taylor_rematch_1.json index 767d619334..a1b2f5bca7 100644 --- a/res/trainers/data/ranger_taylor_rematch_1.json +++ b/res/trainers/data/ranger_taylor_rematch_1.json @@ -15,7 +15,7 @@ "level": 34, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 36, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_taylor_rematch_2.json b/res/trainers/data/ranger_taylor_rematch_2.json index 97cf916589..ea4fbfa7a3 100644 --- a/res/trainers/data/ranger_taylor_rematch_2.json +++ b/res/trainers/data/ranger_taylor_rematch_2.json @@ -15,7 +15,7 @@ "level": 44, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 46, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/ranger_taylor_rematch_3.json b/res/trainers/data/ranger_taylor_rematch_3.json index 531c2ed932..6c8a84cd6f 100644 --- a/res/trainers/data/ranger_taylor_rematch_3.json +++ b/res/trainers/data/ranger_taylor_rematch_3.json @@ -15,7 +15,7 @@ "level": 60, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 62, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 58, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/reporter_kinsey.json b/res/trainers/data/reporter_kinsey.json index 4711ce6bee..7085b816db 100644 --- a/res/trainers/data/reporter_kinsey.json +++ b/res/trainers/data/reporter_kinsey.json @@ -13,7 +13,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/reporter_kinsey_rematch_1.json b/res/trainers/data/reporter_kinsey_rematch_1.json index d5212c5e48..c18611f2cb 100644 --- a/res/trainers/data/reporter_kinsey_rematch_1.json +++ b/res/trainers/data/reporter_kinsey_rematch_1.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/reporter_kinsey_rematch_2.json b/res/trainers/data/reporter_kinsey_rematch_2.json index c3b48aad0a..51bb9c68d0 100644 --- a/res/trainers/data/reporter_kinsey_rematch_2.json +++ b/res/trainers/data/reporter_kinsey_rematch_2.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/reporter_kinsey_rematch_3.json b/res/trainers/data/reporter_kinsey_rematch_3.json index c80860a80d..696221053c 100644 --- a/res/trainers/data/reporter_kinsey_rematch_3.json +++ b/res/trainers/data/reporter_kinsey_rematch_3.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/reporter_kinsey_rematch_4.json b/res/trainers/data/reporter_kinsey_rematch_4.json index 1ae8954f7f..5f4461e499 100644 --- a/res/trainers/data/reporter_kinsey_rematch_4.json +++ b/res/trainers/data/reporter_kinsey_rematch_4.json @@ -13,7 +13,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/reporter_kinsey_unused.json b/res/trainers/data/reporter_kinsey_unused.json index f95923a253..128323b2eb 100644 --- a/res/trainers/data/reporter_kinsey_unused.json +++ b/res/trainers/data/reporter_kinsey_unused.json @@ -13,7 +13,7 @@ "level": 6, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/reporter_valerie.json b/res/trainers/data/reporter_valerie.json index c5bfbf4f86..e21da71d50 100644 --- a/res/trainers/data/reporter_valerie.json +++ b/res/trainers/data/reporter_valerie.json @@ -13,7 +13,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/rich_boy_jason.json b/res/trainers/data/rich_boy_jason.json index 79945a6d69..e9e643f3af 100644 --- a/res/trainers/data/rich_boy_jason.json +++ b/res/trainers/data/rich_boy_jason.json @@ -15,7 +15,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 23 } ], diff --git a/res/trainers/data/rich_boy_liam.json b/res/trainers/data/rich_boy_liam.json index 4c07250cbe..5db105465e 100644 --- a/res/trainers/data/rich_boy_liam.json +++ b/res/trainers/data/rich_boy_liam.json @@ -15,7 +15,7 @@ "level": 35, "item": "ITEM_RARE_CANDY", "moves": null, - "power": 250, + "iv_scale": 250, "ball_seal": 26 } ], diff --git a/res/trainers/data/rich_boy_roman.json b/res/trainers/data/rich_boy_roman.json index d330eec814..24b0020649 100644 --- a/res/trainers/data/rich_boy_roman.json +++ b/res/trainers/data/rich_boy_roman.json @@ -15,7 +15,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/rich_boy_trey.json b/res/trainers/data/rich_boy_trey.json index 28b8cbb17e..a0baf75308 100644 --- a/res/trainers/data/rich_boy_trey.json +++ b/res/trainers/data/rich_boy_trey.json @@ -15,7 +15,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 4 } ], diff --git a/res/trainers/data/rich_boy_trey_rematch_1.json b/res/trainers/data/rich_boy_trey_rematch_1.json index 67e5179668..10ba4b22e4 100644 --- a/res/trainers/data/rich_boy_trey_rematch_1.json +++ b/res/trainers/data/rich_boy_trey_rematch_1.json @@ -15,7 +15,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 4 } ], diff --git a/res/trainers/data/rich_boy_trey_rematch_2.json b/res/trainers/data/rich_boy_trey_rematch_2.json index fd7ef9229e..edc160adee 100644 --- a/res/trainers/data/rich_boy_trey_rematch_2.json +++ b/res/trainers/data/rich_boy_trey_rematch_2.json @@ -15,7 +15,7 @@ "level": 61, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 4 } ], diff --git a/res/trainers/data/riley_battleground.json b/res/trainers/data/riley_battleground.json index 221464aeff..7c5b966b9e 100644 --- a/res/trainers/data/riley_battleground.json +++ b/res/trainers/data/riley_battleground.json @@ -23,7 +23,7 @@ "MOVE_SWORDS_DANCE", "MOVE_QUICK_ATTACK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_AERIAL_ACE", "MOVE_SHADOW_CLAW" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_HAMMER_ARM", "MOVE_BULLET_PUNCH" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_FIRE_FANG", "MOVE_THUNDER_FANG" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_BONE_RUSH", "MOVE_BLAZE_KICK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 } ], diff --git a/res/trainers/data/riley_iron_island.json b/res/trainers/data/riley_iron_island.json index 6eb1cfd2c3..16c4f9f043 100644 --- a/res/trainers/data/riley_iron_island.json +++ b/res/trainers/data/riley_iron_island.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_BONE_RUSH" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_canalave_city_chimchar.json b/res/trainers/data/rival_canalave_city_chimchar.json index 904a1e997c..49aa054f38 100644 --- a/res/trainers/data/rival_canalave_city_chimchar.json +++ b/res/trainers/data/rival_canalave_city_chimchar.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_DOUBLE_TEAM" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_LEECH_SEED", "MOVE_GRASS_WHISTLE" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_HORN_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_STOMP", "MOVE_TAIL_WHIP" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_METAL_CLAW", "MOVE_FURY_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_canalave_city_piplup.json b/res/trainers/data/rival_canalave_city_piplup.json index 1a843dbc48..d6b5d5d8f7 100644 --- a/res/trainers/data/rival_canalave_city_piplup.json +++ b/res/trainers/data/rival_canalave_city_piplup.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_DOUBLE_TEAM" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_QUICK_ATTACK", "MOVE_SWIFT" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_HORN_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_STOMP", "MOVE_TAIL_WHIP" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_MEGA_DRAIN", "MOVE_LEECH_SEED" ], - "power": 100, + "iv_scale": 100, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_canalave_city_turtwig.json b/res/trainers/data/rival_canalave_city_turtwig.json index a799c11e8d..9e8bed6f44 100644 --- a/res/trainers/data/rival_canalave_city_turtwig.json +++ b/res/trainers/data/rival_canalave_city_turtwig.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_DOUBLE_TEAM" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_QUICK_ATTACK", "MOVE_SWIFT" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_HORN_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_LEECH_SEED", "MOVE_GRASS_WHISTLE" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_MACH_PUNCH", "MOVE_AERIAL_ACE" ], - "power": 100, + "iv_scale": 100, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_fight_area_chimchar.json b/res/trainers/data/rival_fight_area_chimchar.json index d7ba5a7098..9b123ec811 100644 --- a/res/trainers/data/rival_fight_area_chimchar.json +++ b/res/trainers/data/rival_fight_area_chimchar.json @@ -20,7 +20,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_BOUNCE", "MOVE_WILL_O_WISP" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_METAL_CLAW", "MOVE_SHADOW_CLAW" ], - "power": 200, + "iv_scale": 200, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_fight_area_piplup.json b/res/trainers/data/rival_fight_area_piplup.json index d9793ec01f..438eddfc26 100644 --- a/res/trainers/data/rival_fight_area_piplup.json +++ b/res/trainers/data/rival_fight_area_piplup.json @@ -20,7 +20,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_BOUNCE", "MOVE_WILL_O_WISP" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_CRUNCH", "MOVE_SYNTHESIS" ], - "power": 200, + "iv_scale": 200, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_fight_area_turtwig.json b/res/trainers/data/rival_fight_area_turtwig.json index cc80f1d6c2..29e90d8b95 100644 --- a/res/trainers/data/rival_fight_area_turtwig.json +++ b/res/trainers/data/rival_fight_area_turtwig.json @@ -20,7 +20,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_SHADOW_CLAW", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_pastoria_city_chimchar.json b/res/trainers/data/rival_pastoria_city_chimchar.json index 8165bfe332..83d4876c56 100644 --- a/res/trainers/data/rival_pastoria_city_chimchar.json +++ b/res/trainers/data/rival_pastoria_city_chimchar.json @@ -20,7 +20,7 @@ "MOVE_ENDEAVOR", "MOVE_DOUBLE_TEAM" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_LEECH_SEED", "MOVE_MAGICAL_LEAF" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_TAIL_WHIP", "MOVE_GROWL" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_METAL_CLAW", "MOVE_GROWL" ], - "power": 80, + "iv_scale": 80, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_pastoria_city_piplup.json b/res/trainers/data/rival_pastoria_city_piplup.json index ddfcf476c7..39ad4591b8 100644 --- a/res/trainers/data/rival_pastoria_city_piplup.json +++ b/res/trainers/data/rival_pastoria_city_piplup.json @@ -20,7 +20,7 @@ "MOVE_ENDEAVOR", "MOVE_DOUBLE_TEAM" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_PURSUIT", "MOVE_GROWL" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_TAIL_WHIP", "MOVE_GROWL" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_MEGA_DRAIN", "MOVE_WITHDRAW" ], - "power": 80, + "iv_scale": 80, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_pastoria_city_turtwig.json b/res/trainers/data/rival_pastoria_city_turtwig.json index fbab6ed492..3f694920b3 100644 --- a/res/trainers/data/rival_pastoria_city_turtwig.json +++ b/res/trainers/data/rival_pastoria_city_turtwig.json @@ -20,7 +20,7 @@ "MOVE_ENDEAVOR", "MOVE_DOUBLE_TEAM" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_PURSUIT", "MOVE_GROWL" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_LEECH_SEED", "MOVE_MAGICAL_LEAF" ], - "power": 80, + "iv_scale": 80, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_FURY_SWIPES", "MOVE_LEER" ], - "power": 80, + "iv_scale": 80, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_pokemon_league_chimchar.json b/res/trainers/data/rival_pokemon_league_chimchar.json index 8e92b1b9be..a3f3cac215 100644 --- a/res/trainers/data/rival_pokemon_league_chimchar.json +++ b/res/trainers/data/rival_pokemon_league_chimchar.json @@ -20,7 +20,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_BOUNCE", "MOVE_WILL_O_WISP" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_METAL_CLAW", "MOVE_SHADOW_CLAW" ], - "power": 200, + "iv_scale": 200, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_pokemon_league_piplup.json b/res/trainers/data/rival_pokemon_league_piplup.json index 351502cd0c..a5baf17af1 100644 --- a/res/trainers/data/rival_pokemon_league_piplup.json +++ b/res/trainers/data/rival_pokemon_league_piplup.json @@ -20,7 +20,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_BOUNCE", "MOVE_WILL_O_WISP" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_CRUNCH", "MOVE_SYNTHESIS" ], - "power": 200, + "iv_scale": 200, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_pokemon_league_turtwig.json b/res/trainers/data/rival_pokemon_league_turtwig.json index 048f4fd3e3..16b79deb3a 100644 --- a/res/trainers/data/rival_pokemon_league_turtwig.json +++ b/res/trainers/data/rival_pokemon_league_turtwig.json @@ -20,7 +20,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_SHADOW_CLAW", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_route_201_chimchar.json b/res/trainers/data/rival_route_201_chimchar.json index c6ef400c46..b48153a7a9 100644 --- a/res/trainers/data/rival_route_201_chimchar.json +++ b/res/trainers/data/rival_route_201_chimchar.json @@ -15,7 +15,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_route_201_piplup.json b/res/trainers/data/rival_route_201_piplup.json index 37a71cfbe4..f3ca3818b3 100644 --- a/res/trainers/data/rival_route_201_piplup.json +++ b/res/trainers/data/rival_route_201_piplup.json @@ -15,7 +15,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_route_201_turtwig.json b/res/trainers/data/rival_route_201_turtwig.json index 1a992cac3a..fae97c066b 100644 --- a/res/trainers/data/rival_route_201_turtwig.json +++ b/res/trainers/data/rival_route_201_turtwig.json @@ -15,7 +15,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_route_203_chimchar.json b/res/trainers/data/rival_route_203_chimchar.json index e7bfb6b3ec..450091808e 100644 --- a/res/trainers/data/rival_route_203_chimchar.json +++ b/res/trainers/data/rival_route_203_chimchar.json @@ -18,7 +18,7 @@ "MOVE_QUICK_ATTACK", "MOVE_GROWL" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_POUND", "MOVE_GROWL" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_route_203_piplup.json b/res/trainers/data/rival_route_203_piplup.json index 5afc54c88b..87bc80ee09 100644 --- a/res/trainers/data/rival_route_203_piplup.json +++ b/res/trainers/data/rival_route_203_piplup.json @@ -18,7 +18,7 @@ "MOVE_QUICK_ATTACK", "MOVE_GROWL" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_TACKLE", "MOVE_WITHDRAW" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_route_203_turtwig.json b/res/trainers/data/rival_route_203_turtwig.json index 4adcda46f7..f918fa2b06 100644 --- a/res/trainers/data/rival_route_203_turtwig.json +++ b/res/trainers/data/rival_route_203_turtwig.json @@ -18,7 +18,7 @@ "MOVE_QUICK_ATTACK", "MOVE_GROWL" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_SCRATCH", "MOVE_LEER" ], - "power": 30, + "iv_scale": 30, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_route_209_chimchar.json b/res/trainers/data/rival_route_209_chimchar.json index 20c05c4f90..b5b85b6f0d 100644 --- a/res/trainers/data/rival_route_209_chimchar.json +++ b/res/trainers/data/rival_route_209_chimchar.json @@ -20,7 +20,7 @@ "MOVE_ENDEAVOR", "MOVE_DOUBLE_TEAM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_LEECH_SEED", "MOVE_STUN_SPORE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_TAIL_WHIP", "MOVE_GROWL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_METAL_CLAW", "MOVE_GROWL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_route_209_piplup.json b/res/trainers/data/rival_route_209_piplup.json index ac1fb4d803..2ae252abf4 100644 --- a/res/trainers/data/rival_route_209_piplup.json +++ b/res/trainers/data/rival_route_209_piplup.json @@ -20,7 +20,7 @@ "MOVE_ENDEAVOR", "MOVE_DOUBLE_TEAM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_PURSUIT", "MOVE_GROWL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_TAIL_WHIP", "MOVE_GROWL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_ABSORB", "MOVE_WITHDRAW" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_route_209_turtwig.json b/res/trainers/data/rival_route_209_turtwig.json index e26f86e805..02d1c10917 100644 --- a/res/trainers/data/rival_route_209_turtwig.json +++ b/res/trainers/data/rival_route_209_turtwig.json @@ -20,7 +20,7 @@ "MOVE_ENDEAVOR", "MOVE_DOUBLE_TEAM" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_PURSUIT", "MOVE_GROWL" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_LEECH_SEED", "MOVE_STUN_SPORE" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_FURY_SWIPES", "MOVE_LEER" ], - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/rival_spear_pillar_chimchar.json b/res/trainers/data/rival_spear_pillar_chimchar.json index bcb99b9f4b..9f1dd0b18b 100644 --- a/res/trainers/data/rival_spear_pillar_chimchar.json +++ b/res/trainers/data/rival_spear_pillar_chimchar.json @@ -20,7 +20,7 @@ "MOVE_SWALLOW", "MOVE_SCREECH" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_TAKE_DOWN", "MOVE_QUICK_ATTACK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_INGRAIN", "MOVE_GRASS_WHISTLE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_STOMP", "MOVE_TAKE_DOWN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_METAL_CLAW", "MOVE_SWAGGER" ], - "power": 200, + "iv_scale": 200, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_spear_pillar_piplup.json b/res/trainers/data/rival_spear_pillar_piplup.json index 33ccebdc9c..bd52d18fb4 100644 --- a/res/trainers/data/rival_spear_pillar_piplup.json +++ b/res/trainers/data/rival_spear_pillar_piplup.json @@ -20,7 +20,7 @@ "MOVE_SWALLOW", "MOVE_SCREECH" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_TAKE_DOWN", "MOVE_QUICK_ATTACK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_BRICK_BREAK", "MOVE_IRON_TAIL" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_STOMP", "MOVE_TAKE_DOWN" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_LEECH_SEED", "MOVE_SYNTHESIS" ], - "power": 200, + "iv_scale": 200, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_spear_pillar_turtwig.json b/res/trainers/data/rival_spear_pillar_turtwig.json index 4c657c4190..35a681f366 100644 --- a/res/trainers/data/rival_spear_pillar_turtwig.json +++ b/res/trainers/data/rival_spear_pillar_turtwig.json @@ -20,7 +20,7 @@ "MOVE_SWALLOW", "MOVE_SCREECH" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_TAKE_DOWN", "MOVE_QUICK_ATTACK" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_BRICK_BREAK", "MOVE_IRON_TAIL" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -62,7 +62,7 @@ "MOVE_NIGHT_SLASH", "MOVE_AERIAL_ACE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -76,7 +76,7 @@ "MOVE_INGRAIN", "MOVE_GRASS_WHISTLE" ], - "power": 200, + "iv_scale": 200, "ball_seal": 0 }, { @@ -90,7 +90,7 @@ "MOVE_FLAME_WHEEL", "MOVE_WILL_O_WISP" ], - "power": 200, + "iv_scale": 200, "ball_seal": 10 } ], diff --git a/res/trainers/data/rival_survival_area_1_chimchar.json b/res/trainers/data/rival_survival_area_1_chimchar.json index 9e682ae5e6..e55a497dc9 100644 --- a/res/trainers/data/rival_survival_area_1_chimchar.json +++ b/res/trainers/data/rival_survival_area_1_chimchar.json @@ -23,7 +23,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_NIGHT_SLASH", "MOVE_ROCK_SLIDE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_BOUNCE", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -93,7 +93,7 @@ "MOVE_DRILL_PECK", "MOVE_SHADOW_CLAW" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_survival_area_1_piplup.json b/res/trainers/data/rival_survival_area_1_piplup.json index dc60333f16..b51bbb5038 100644 --- a/res/trainers/data/rival_survival_area_1_piplup.json +++ b/res/trainers/data/rival_survival_area_1_piplup.json @@ -23,7 +23,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_NIGHT_SLASH", "MOVE_ROCK_SLIDE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_BOUNCE", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -93,7 +93,7 @@ "MOVE_CRUNCH", "MOVE_LEECH_SEED" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_survival_area_1_turtwig.json b/res/trainers/data/rival_survival_area_1_turtwig.json index dea2e7a2aa..e2f7f03e98 100644 --- a/res/trainers/data/rival_survival_area_1_turtwig.json +++ b/res/trainers/data/rival_survival_area_1_turtwig.json @@ -23,7 +23,7 @@ "MOVE_STEEL_WING", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_NIGHT_SLASH", "MOVE_ROCK_SLIDE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_EARTHQUAKE", "MOVE_REST" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -93,7 +93,7 @@ "MOVE_SHADOW_CLAW", "MOVE_AERIAL_ACE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_survival_area_2_chimchar.json b/res/trainers/data/rival_survival_area_2_chimchar.json index 226d7ac6d7..5b1452061f 100644 --- a/res/trainers/data/rival_survival_area_2_chimchar.json +++ b/res/trainers/data/rival_survival_area_2_chimchar.json @@ -25,7 +25,7 @@ "MOVE_QUICK_ATTACK", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -39,7 +39,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -53,7 +53,7 @@ "MOVE_NIGHT_SLASH", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -67,7 +67,7 @@ "MOVE_MEGAHORN", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -81,7 +81,7 @@ "MOVE_EARTHQUAKE", "MOVE_ZEN_HEADBUTT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -95,7 +95,7 @@ "MOVE_DRILL_PECK", "MOVE_ICE_BEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_survival_area_2_piplup.json b/res/trainers/data/rival_survival_area_2_piplup.json index 230c5fc93c..b99a979a00 100644 --- a/res/trainers/data/rival_survival_area_2_piplup.json +++ b/res/trainers/data/rival_survival_area_2_piplup.json @@ -25,7 +25,7 @@ "MOVE_QUICK_ATTACK", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -39,7 +39,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -53,7 +53,7 @@ "MOVE_NIGHT_SLASH", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -67,7 +67,7 @@ "MOVE_MEGAHORN", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -81,7 +81,7 @@ "MOVE_EARTHQUAKE", "MOVE_ZEN_HEADBUTT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -95,7 +95,7 @@ "MOVE_CRUNCH", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_survival_area_2_turtwig.json b/res/trainers/data/rival_survival_area_2_turtwig.json index ab311d6150..1f7eaf5393 100644 --- a/res/trainers/data/rival_survival_area_2_turtwig.json +++ b/res/trainers/data/rival_survival_area_2_turtwig.json @@ -25,7 +25,7 @@ "MOVE_QUICK_ATTACK", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -39,7 +39,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -53,7 +53,7 @@ "MOVE_NIGHT_SLASH", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -67,7 +67,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -81,7 +81,7 @@ "MOVE_EARTHQUAKE", "MOVE_ZEN_HEADBUTT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -95,7 +95,7 @@ "MOVE_SHADOW_CLAW", "MOVE_AERIAL_ACE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_survival_area_unused_chimchar.json b/res/trainers/data/rival_survival_area_unused_chimchar.json index 242ddc646a..014b212538 100644 --- a/res/trainers/data/rival_survival_area_unused_chimchar.json +++ b/res/trainers/data/rival_survival_area_unused_chimchar.json @@ -23,7 +23,7 @@ "MOVE_QUICK_ATTACK", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_NIGHT_SLASH", "MOVE_ROCK_SLIDE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_MEGAHORN", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_EARTHQUAKE", "MOVE_ZEN_HEADBUTT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -93,7 +93,7 @@ "MOVE_DRILL_PECK", "MOVE_ICE_BEAM" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_survival_area_unused_piplup.json b/res/trainers/data/rival_survival_area_unused_piplup.json index 8d03d64e37..fba6f2195e 100644 --- a/res/trainers/data/rival_survival_area_unused_piplup.json +++ b/res/trainers/data/rival_survival_area_unused_piplup.json @@ -23,7 +23,7 @@ "MOVE_QUICK_ATTACK", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_NIGHT_SLASH", "MOVE_ROCK_SLIDE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_MEGAHORN", "MOVE_WILL_O_WISP" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_EARTHQUAKE", "MOVE_ZEN_HEADBUTT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -93,7 +93,7 @@ "MOVE_CRUNCH", "MOVE_STONE_EDGE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/rival_survival_area_unused_turtwig.json b/res/trainers/data/rival_survival_area_unused_turtwig.json index 13af582a6f..d4e528cb64 100644 --- a/res/trainers/data/rival_survival_area_unused_turtwig.json +++ b/res/trainers/data/rival_survival_area_unused_turtwig.json @@ -23,7 +23,7 @@ "MOVE_QUICK_ATTACK", "MOVE_U_TURN" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -37,7 +37,7 @@ "MOVE_ICE_FANG", "MOVE_BRICK_BREAK" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -51,7 +51,7 @@ "MOVE_NIGHT_SLASH", "MOVE_ROCK_SLIDE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -65,7 +65,7 @@ "MOVE_SHADOW_BALL", "MOVE_GRASS_WHISTLE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -79,7 +79,7 @@ "MOVE_EARTHQUAKE", "MOVE_ZEN_HEADBUTT" ], - "power": 250, + "iv_scale": 250, "ball_seal": 0 }, { @@ -93,7 +93,7 @@ "MOVE_SHADOW_CLAW", "MOVE_AERIAL_ACE" ], - "power": 250, + "iv_scale": 250, "ball_seal": 24 } ], diff --git a/res/trainers/data/roughneck_kirby.json b/res/trainers/data/roughneck_kirby.json index ae9e91fe64..1c23a70283 100644 --- a/res/trainers/data/roughneck_kirby.json +++ b/res/trainers/data/roughneck_kirby.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_bryan.json b/res/trainers/data/ruin_maniac_bryan.json index 4a3c5cbef4..9ec0a18d32 100644 --- a/res/trainers/data/ruin_maniac_bryan.json +++ b/res/trainers/data/ruin_maniac_bryan.json @@ -15,7 +15,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_calvin.json b/res/trainers/data/ruin_maniac_calvin.json index bbb292f3d4..29c07fcb57 100644 --- a/res/trainers/data/ruin_maniac_calvin.json +++ b/res/trainers/data/ruin_maniac_calvin.json @@ -15,7 +15,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_gerald.json b/res/trainers/data/ruin_maniac_gerald.json index 9225477942..ab7f80bf09 100644 --- a/res/trainers/data/ruin_maniac_gerald.json +++ b/res/trainers/data/ruin_maniac_gerald.json @@ -15,7 +15,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_harry.json b/res/trainers/data/ruin_maniac_harry.json index 629d5d35ab..be2a28f69a 100644 --- a/res/trainers/data/ruin_maniac_harry.json +++ b/res/trainers/data/ruin_maniac_harry.json @@ -15,7 +15,7 @@ "level": 28, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_harry_rematch_1.json b/res/trainers/data/ruin_maniac_harry_rematch_1.json index 23f1c646ad..74cb0ce9a0 100644 --- a/res/trainers/data/ruin_maniac_harry_rematch_1.json +++ b/res/trainers/data/ruin_maniac_harry_rematch_1.json @@ -15,7 +15,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_harry_rematch_2.json b/res/trainers/data/ruin_maniac_harry_rematch_2.json index 4529a34643..7db10f1d55 100644 --- a/res/trainers/data/ruin_maniac_harry_rematch_2.json +++ b/res/trainers/data/ruin_maniac_harry_rematch_2.json @@ -15,7 +15,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_karl.json b/res/trainers/data/ruin_maniac_karl.json index 602161a6e0..590bc94de0 100644 --- a/res/trainers/data/ruin_maniac_karl.json +++ b/res/trainers/data/ruin_maniac_karl.json @@ -15,7 +15,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -24,7 +24,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_larry.json b/res/trainers/data/ruin_maniac_larry.json index 637e7d6493..80caf00248 100644 --- a/res/trainers/data/ruin_maniac_larry.json +++ b/res/trainers/data/ruin_maniac_larry.json @@ -15,7 +15,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/ruin_maniac_ronald.json b/res/trainers/data/ruin_maniac_ronald.json index 738f43e181..d7bb06d4ad 100644 --- a/res/trainers/data/ruin_maniac_ronald.json +++ b/res/trainers/data/ruin_maniac_ronald.json @@ -15,7 +15,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_damian.json b/res/trainers/data/sailor_damian.json index efaeec176a..51bf03e0c3 100644 --- a/res/trainers/data/sailor_damian.json +++ b/res/trainers/data/sailor_damian.json @@ -17,7 +17,7 @@ "MOVE_WING_ATTACK", "MOVE_QUICK_ATTACK" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_WING_ATTACK", "MOVE_QUICK_ATTACK" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_luther.json b/res/trainers/data/sailor_luther.json index 5935d8c869..45b54a1478 100644 --- a/res/trainers/data/sailor_luther.json +++ b/res/trainers/data/sailor_luther.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_marc.json b/res/trainers/data/sailor_marc.json index ae383af48e..7a5b2918b6 100644 --- a/res/trainers/data/sailor_marc.json +++ b/res/trainers/data/sailor_marc.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_marc_rematch_1.json b/res/trainers/data/sailor_marc_rematch_1.json index 481260cbba..1df51611a3 100644 --- a/res/trainers/data/sailor_marc_rematch_1.json +++ b/res/trainers/data/sailor_marc_rematch_1.json @@ -13,7 +13,7 @@ "level": 52, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 52, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_marc_rematch_2.json b/res/trainers/data/sailor_marc_rematch_2.json index 71861004b9..9da4fe723c 100644 --- a/res/trainers/data/sailor_marc_rematch_2.json +++ b/res/trainers/data/sailor_marc_rematch_2.json @@ -13,7 +13,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_paul.json b/res/trainers/data/sailor_paul.json index b54894d88e..8556e21dce 100644 --- a/res/trainers/data/sailor_paul.json +++ b/res/trainers/data/sailor_paul.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_samson.json b/res/trainers/data/sailor_samson.json index 76117d49a5..18d7ec400d 100644 --- a/res/trainers/data/sailor_samson.json +++ b/res/trainers/data/sailor_samson.json @@ -17,7 +17,7 @@ "MOVE_WING_ATTACK", "MOVE_SUPERSONIC" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_MUD_BOMB", "MOVE_RAIN_DANCE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -43,7 +43,7 @@ "MOVE_CONFUSION", "MOVE_WATER_PULSE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_skyler.json b/res/trainers/data/sailor_skyler.json index 3536f81e22..67a0acb30d 100644 --- a/res/trainers/data/sailor_skyler.json +++ b/res/trainers/data/sailor_skyler.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_zachariah.json b/res/trainers/data/sailor_zachariah.json index 5a47aa732e..bd7d376c3b 100644 --- a/res/trainers/data/sailor_zachariah.json +++ b/res/trainers/data/sailor_zachariah.json @@ -13,7 +13,7 @@ "level": 40, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/sailor_zachariah_rematch.json b/res/trainers/data/sailor_zachariah_rematch.json index d0ff9a8e83..348e9e5395 100644 --- a/res/trainers/data/sailor_zachariah_rematch.json +++ b/res/trainers/data/sailor_zachariah_rematch.json @@ -13,7 +13,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 60, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/school_kid_chance.json b/res/trainers/data/school_kid_chance.json index 1d9649e575..589e89c3bf 100644 --- a/res/trainers/data/school_kid_chance.json +++ b/res/trainers/data/school_kid_chance.json @@ -21,7 +21,7 @@ "MOVE_CONFUSE_RAY", "MOVE_HYPNOSIS" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/school_kid_christine.json b/res/trainers/data/school_kid_christine.json index 50b5551dcf..2ce10c1849 100644 --- a/res/trainers/data/school_kid_christine.json +++ b/res/trainers/data/school_kid_christine.json @@ -16,7 +16,7 @@ "level": 6, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/school_kid_esteban.json b/res/trainers/data/school_kid_esteban.json index fad2f8a553..e1fa09f1cd 100644 --- a/res/trainers/data/school_kid_esteban.json +++ b/res/trainers/data/school_kid_esteban.json @@ -21,7 +21,7 @@ "MOVE_WATER_GUN", "MOVE_AMNESIA" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/school_kid_forrest.json b/res/trainers/data/school_kid_forrest.json index c04ccd343a..d34efd631f 100644 --- a/res/trainers/data/school_kid_forrest.json +++ b/res/trainers/data/school_kid_forrest.json @@ -20,7 +20,7 @@ "MOVE_TRI_ATTACK", "MOVE_MIRROR_SHOT" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/school_kid_harrison.json b/res/trainers/data/school_kid_harrison.json index 8ba0c59ed5..451af3b272 100644 --- a/res/trainers/data/school_kid_harrison.json +++ b/res/trainers/data/school_kid_harrison.json @@ -18,7 +18,7 @@ "moves": [ "MOVE_QUICK_ATTACK" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/school_kid_mackenzie.json b/res/trainers/data/school_kid_mackenzie.json index 5f0768644a..8723c67d0e 100644 --- a/res/trainers/data/school_kid_mackenzie.json +++ b/res/trainers/data/school_kid_mackenzie.json @@ -21,7 +21,7 @@ "MOVE_ASTONISH", "MOVE_MINIMIZE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_SWALLOW", "MOVE_STOCKPILE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/school_kid_tiera.json b/res/trainers/data/school_kid_tiera.json index 1ba2f034d2..fcfcb526a7 100644 --- a/res/trainers/data/school_kid_tiera.json +++ b/res/trainers/data/school_kid_tiera.json @@ -21,7 +21,7 @@ "MOVE_DISCHARGE", "MOVE_SWEET_KISS" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_darrius.json b/res/trainers/data/scientist_darrius.json index 78445ce59f..3c3a64efce 100644 --- a/res/trainers/data/scientist_darrius.json +++ b/res/trainers/data/scientist_darrius.json @@ -21,7 +21,7 @@ "MOVE_ICE_BEAM", "MOVE_TRI_ATTACK" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_emilio.json b/res/trainers/data/scientist_emilio.json index 2d9f9ace4f..2bddb45274 100644 --- a/res/trainers/data/scientist_emilio.json +++ b/res/trainers/data/scientist_emilio.json @@ -16,7 +16,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_fredrick.json b/res/trainers/data/scientist_fredrick.json index 6a2410b055..374d006674 100644 --- a/res/trainers/data/scientist_fredrick.json +++ b/res/trainers/data/scientist_fredrick.json @@ -21,7 +21,7 @@ "MOVE_HYPNOSIS", "MOVE_FUTURE_SIGHT" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -35,7 +35,7 @@ "MOVE_THUNDER_WAVE", "MOVE_RECOVER" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_shaun.json b/res/trainers/data/scientist_shaun.json index d80c7fb491..98ae079d86 100644 --- a/res/trainers/data/scientist_shaun.json +++ b/res/trainers/data/scientist_shaun.json @@ -19,7 +19,7 @@ "MOVE_SPARK", "MOVE_MAGNET_BOMB" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_KINESIS", "MOVE_THUNDER_PUNCH" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_shaun_rematch_1.json b/res/trainers/data/scientist_shaun_rematch_1.json index c28d7b0bcc..ad115251d9 100644 --- a/res/trainers/data/scientist_shaun_rematch_1.json +++ b/res/trainers/data/scientist_shaun_rematch_1.json @@ -16,7 +16,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -25,7 +25,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_shaun_rematch_2.json b/res/trainers/data/scientist_shaun_rematch_2.json index 940256d122..93d201cff6 100644 --- a/res/trainers/data/scientist_shaun_rematch_2.json +++ b/res/trainers/data/scientist_shaun_rematch_2.json @@ -16,7 +16,7 @@ "level": 46, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -25,7 +25,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_shaun_rematch_3.json b/res/trainers/data/scientist_shaun_rematch_3.json index 2e7d96d1ce..94013df151 100644 --- a/res/trainers/data/scientist_shaun_rematch_3.json +++ b/res/trainers/data/scientist_shaun_rematch_3.json @@ -16,7 +16,7 @@ "level": 55, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -25,7 +25,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_stefano.json b/res/trainers/data/scientist_stefano.json index 2038e34a8e..7036a4e360 100644 --- a/res/trainers/data/scientist_stefano.json +++ b/res/trainers/data/scientist_stefano.json @@ -21,7 +21,7 @@ "MOVE_KINESIS", "MOVE_ICE_PUNCH" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/scientist_travon.json b/res/trainers/data/scientist_travon.json index 41c7b7115d..329e83ecd9 100644 --- a/res/trainers/data/scientist_travon.json +++ b/res/trainers/data/scientist_travon.json @@ -18,7 +18,7 @@ "moves": [ "MOVE_CONFUSION" ], - "power": 20, + "iv_scale": 20, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_andrea.json b/res/trainers/data/skier_andrea.json index 16c9c19eb3..7be0c19367 100644 --- a/res/trainers/data/skier_andrea.json +++ b/res/trainers/data/skier_andrea.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_andrea_rematch_1.json b/res/trainers/data/skier_andrea_rematch_1.json index bc1a23c36c..7e26bc4886 100644 --- a/res/trainers/data/skier_andrea_rematch_1.json +++ b/res/trainers/data/skier_andrea_rematch_1.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_andrea_rematch_2.json b/res/trainers/data/skier_andrea_rematch_2.json index 9b958da5cf..13945b8e26 100644 --- a/res/trainers/data/skier_andrea_rematch_2.json +++ b/res/trainers/data/skier_andrea_rematch_2.json @@ -13,7 +13,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_bjorn.json b/res/trainers/data/skier_bjorn.json index 08c71ca192..b98e9fcd44 100644 --- a/res/trainers/data/skier_bjorn.json +++ b/res/trainers/data/skier_bjorn.json @@ -13,7 +13,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 38, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_bjorn_rematch_1.json b/res/trainers/data/skier_bjorn_rematch_1.json index 726c5aad15..0fbcefae09 100644 --- a/res/trainers/data/skier_bjorn_rematch_1.json +++ b/res/trainers/data/skier_bjorn_rematch_1.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_bjorn_rematch_2.json b/res/trainers/data/skier_bjorn_rematch_2.json index 88fb7ad5a4..173dae2d00 100644 --- a/res/trainers/data/skier_bjorn_rematch_2.json +++ b/res/trainers/data/skier_bjorn_rematch_2.json @@ -13,7 +13,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 60, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_bradley.json b/res/trainers/data/skier_bradley.json index f14b2f1df8..528197f7fe 100644 --- a/res/trainers/data/skier_bradley.json +++ b/res/trainers/data/skier_bradley.json @@ -13,7 +13,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_edward.json b/res/trainers/data/skier_edward.json index bfeda1adc2..90d05865c0 100644 --- a/res/trainers/data/skier_edward.json +++ b/res/trainers/data/skier_edward.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_edward_rematch_1.json b/res/trainers/data/skier_edward_rematch_1.json index 63e9be5b9e..f3e155de51 100644 --- a/res/trainers/data/skier_edward_rematch_1.json +++ b/res/trainers/data/skier_edward_rematch_1.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_edward_rematch_2.json b/res/trainers/data/skier_edward_rematch_2.json index 1091c64f32..fbb8c7b02b 100644 --- a/res/trainers/data/skier_edward_rematch_2.json +++ b/res/trainers/data/skier_edward_rematch_2.json @@ -13,7 +13,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_kaitlyn.json b/res/trainers/data/skier_kaitlyn.json index 1d78beef74..476bcdc5fc 100644 --- a/res/trainers/data/skier_kaitlyn.json +++ b/res/trainers/data/skier_kaitlyn.json @@ -13,7 +13,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 38, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_lexie.json b/res/trainers/data/skier_lexie.json index 71a51398e8..87d6494f5d 100644 --- a/res/trainers/data/skier_lexie.json +++ b/res/trainers/data/skier_lexie.json @@ -13,7 +13,7 @@ "level": 37, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 37, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_madison.json b/res/trainers/data/skier_madison.json index e19d4a82e5..1b320f6182 100644 --- a/res/trainers/data/skier_madison.json +++ b/res/trainers/data/skier_madison.json @@ -13,7 +13,7 @@ "level": 39, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_madison_rematch_1.json b/res/trainers/data/skier_madison_rematch_1.json index cb7dbd5808..2d4bbc9623 100644 --- a/res/trainers/data/skier_madison_rematch_1.json +++ b/res/trainers/data/skier_madison_rematch_1.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_madison_rematch_2.json b/res/trainers/data/skier_madison_rematch_2.json index fe8b7d8b1c..b04d1a243c 100644 --- a/res/trainers/data/skier_madison_rematch_2.json +++ b/res/trainers/data/skier_madison_rematch_2.json @@ -13,7 +13,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/skier_shawn.json b/res/trainers/data/skier_shawn.json index c51be83e7b..157e47944a 100644 --- a/res/trainers/data/skier_shawn.json +++ b/res/trainers/data/skier_shawn.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 37, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/socialite_rebecca.json b/res/trainers/data/socialite_rebecca.json index 283dd2384b..03d8b833c7 100644 --- a/res/trainers/data/socialite_rebecca.json +++ b/res/trainers/data/socialite_rebecca.json @@ -15,7 +15,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/socialite_reina.json b/res/trainers/data/socialite_reina.json index f06f76c61d..845621e683 100644 --- a/res/trainers/data/socialite_reina.json +++ b/res/trainers/data/socialite_reina.json @@ -15,7 +15,7 @@ "level": 27, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/socialite_reina_rematch_1.json b/res/trainers/data/socialite_reina_rematch_1.json index b3243673ed..845c71041e 100644 --- a/res/trainers/data/socialite_reina_rematch_1.json +++ b/res/trainers/data/socialite_reina_rematch_1.json @@ -15,7 +15,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/socialite_reina_rematch_2.json b/res/trainers/data/socialite_reina_rematch_2.json index 97907c018d..6b40f71406 100644 --- a/res/trainers/data/socialite_reina_rematch_2.json +++ b/res/trainers/data/socialite_reina_rematch_2.json @@ -15,7 +15,7 @@ "level": 61, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_adrian.json b/res/trainers/data/swimmer_adrian.json index fc0396935e..754005d58a 100644 --- a/res/trainers/data/swimmer_adrian.json +++ b/res/trainers/data/swimmer_adrian.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_aubree.json b/res/trainers/data/swimmer_aubree.json index 6a3b5368c1..c67fe20745 100644 --- a/res/trainers/data/swimmer_aubree.json +++ b/res/trainers/data/swimmer_aubree.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_cassandra.json b/res/trainers/data/swimmer_cassandra.json index 407cd277d0..4454c59bfc 100644 --- a/res/trainers/data/swimmer_cassandra.json +++ b/res/trainers/data/swimmer_cassandra.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_claire.json b/res/trainers/data/swimmer_claire.json index 179da290dc..ca541ec5f4 100644 --- a/res/trainers/data/swimmer_claire.json +++ b/res/trainers/data/swimmer_claire.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_colton.json b/res/trainers/data/swimmer_colton.json index 7701985f52..d27d6a28b3 100644 --- a/res/trainers/data/swimmer_colton.json +++ b/res/trainers/data/swimmer_colton.json @@ -13,7 +13,7 @@ "level": 40, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_crystal.json b/res/trainers/data/swimmer_crystal.json index 8445ea35a8..02f3dc6659 100644 --- a/res/trainers/data/swimmer_crystal.json +++ b/res/trainers/data/swimmer_crystal.json @@ -13,7 +13,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_crystal_rematch.json b/res/trainers/data/swimmer_crystal_rematch.json index 43ba2f3d63..66c64c8c39 100644 --- a/res/trainers/data/swimmer_crystal_rematch.json +++ b/res/trainers/data/swimmer_crystal_rematch.json @@ -13,7 +13,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_dillon.json b/res/trainers/data/swimmer_dillon.json index 266c9fcf7e..4f44589018 100644 --- a/res/trainers/data/swimmer_dillon.json +++ b/res/trainers/data/swimmer_dillon.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_erica.json b/res/trainers/data/swimmer_erica.json index 04d139b778..25427b635f 100644 --- a/res/trainers/data/swimmer_erica.json +++ b/res/trainers/data/swimmer_erica.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_erik.json b/res/trainers/data/swimmer_erik.json index f8be06f0f3..049946dac8 100644 --- a/res/trainers/data/swimmer_erik.json +++ b/res/trainers/data/swimmer_erik.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_evan.json b/res/trainers/data/swimmer_evan.json index 62a490972d..eed4584650 100644 --- a/res/trainers/data/swimmer_evan.json +++ b/res/trainers/data/swimmer_evan.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_francisco.json b/res/trainers/data/swimmer_francisco.json index 2dbf6e7a5c..0f222c6216 100644 --- a/res/trainers/data/swimmer_francisco.json +++ b/res/trainers/data/swimmer_francisco.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_francisco_rematch.json b/res/trainers/data/swimmer_francisco_rematch.json index 2f0744aff2..7065bf4f81 100644 --- a/res/trainers/data/swimmer_francisco_rematch.json +++ b/res/trainers/data/swimmer_francisco_rematch.json @@ -13,7 +13,7 @@ "level": 52, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 60, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_gabrielle.json b/res/trainers/data/swimmer_gabrielle.json index 0a0a2071a1..853aa8d481 100644 --- a/res/trainers/data/swimmer_gabrielle.json +++ b/res/trainers/data/swimmer_gabrielle.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_glenn.json b/res/trainers/data/swimmer_glenn.json index 75df3ac9c5..b8a37b1197 100644 --- a/res/trainers/data/swimmer_glenn.json +++ b/res/trainers/data/swimmer_glenn.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_glenn_rematch.json b/res/trainers/data/swimmer_glenn_rematch.json index af6371003c..b7b158fc1b 100644 --- a/res/trainers/data/swimmer_glenn_rematch.json +++ b/res/trainers/data/swimmer_glenn_rematch.json @@ -13,7 +13,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 60, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_haley.json b/res/trainers/data/swimmer_haley.json index f0a3737d40..dd0d97d010 100644 --- a/res/trainers/data/swimmer_haley.json +++ b/res/trainers/data/swimmer_haley.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_jessica.json b/res/trainers/data/swimmer_jessica.json index 97a93631df..542058565d 100644 --- a/res/trainers/data/swimmer_jessica.json +++ b/res/trainers/data/swimmer_jessica.json @@ -13,7 +13,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 30, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_joanna.json b/res/trainers/data/swimmer_joanna.json index ded2f97267..425303e782 100644 --- a/res/trainers/data/swimmer_joanna.json +++ b/res/trainers/data/swimmer_joanna.json @@ -13,7 +13,7 @@ "level": 52, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_joanna_rematch.json b/res/trainers/data/swimmer_joanna_rematch.json index 1e3d3ed928..82f224b348 100644 --- a/res/trainers/data/swimmer_joanna_rematch.json +++ b/res/trainers/data/swimmer_joanna_rematch.json @@ -13,7 +13,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 58, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_katelyn.json b/res/trainers/data/swimmer_katelyn.json index af952f3c36..ad741f1f2e 100644 --- a/res/trainers/data/swimmer_katelyn.json +++ b/res/trainers/data/swimmer_katelyn.json @@ -18,7 +18,7 @@ "MOVE_QUICK_ATTACK", "MOVE_ATTRACT" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_MEDITATE", "MOVE_LIGHT_SCREEN" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -46,7 +46,7 @@ "MOVE_AQUA_RING", "MOVE_CAPTIVATE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 15 } ], diff --git a/res/trainers/data/swimmer_kurt.json b/res/trainers/data/swimmer_kurt.json index 2191762c99..279dcb387b 100644 --- a/res/trainers/data/swimmer_kurt.json +++ b/res/trainers/data/swimmer_kurt.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_lydia.json b/res/trainers/data/swimmer_lydia.json index 17ff5510a4..e30b84370e 100644 --- a/res/trainers/data/swimmer_lydia.json +++ b/res/trainers/data/swimmer_lydia.json @@ -13,7 +13,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_mallory.json b/res/trainers/data/swimmer_mallory.json index 7f621ddf99..30f7fe76c7 100644 --- a/res/trainers/data/swimmer_mallory.json +++ b/res/trainers/data/swimmer_mallory.json @@ -13,7 +13,7 @@ "level": 52, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 54, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_mary.json b/res/trainers/data/swimmer_mary.json index 2e884662b2..d50c5a3235 100644 --- a/res/trainers/data/swimmer_mary.json +++ b/res/trainers/data/swimmer_mary.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_miranda.json b/res/trainers/data/swimmer_miranda.json index 7c14763238..4481a57895 100644 --- a/res/trainers/data/swimmer_miranda.json +++ b/res/trainers/data/swimmer_miranda.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_miranda_rematch.json b/res/trainers/data/swimmer_miranda_rematch.json index 28412a16c7..8f5461ad9b 100644 --- a/res/trainers/data/swimmer_miranda_rematch.json +++ b/res/trainers/data/swimmer_miranda_rematch.json @@ -13,7 +13,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 59, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_oscar.json b/res/trainers/data/swimmer_oscar.json index f73e19dffa..3e90a92ad0 100644 --- a/res/trainers/data/swimmer_oscar.json +++ b/res/trainers/data/swimmer_oscar.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_paige.json b/res/trainers/data/swimmer_paige.json index e9fc558af4..12551a6b55 100644 --- a/res/trainers/data/swimmer_paige.json +++ b/res/trainers/data/swimmer_paige.json @@ -13,7 +13,7 @@ "level": 41, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 42, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_ricardo.json b/res/trainers/data/swimmer_ricardo.json index 9705a6a580..86554b56b9 100644 --- a/res/trainers/data/swimmer_ricardo.json +++ b/res/trainers/data/swimmer_ricardo.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_sam.json b/res/trainers/data/swimmer_sam.json index 94524d3958..ea8d2aaf8b 100644 --- a/res/trainers/data/swimmer_sam.json +++ b/res/trainers/data/swimmer_sam.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 1 } ], diff --git a/res/trainers/data/swimmer_sheltin.json b/res/trainers/data/swimmer_sheltin.json index 3131b6f34e..3bb768bf61 100644 --- a/res/trainers/data/swimmer_sheltin.json +++ b/res/trainers/data/swimmer_sheltin.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_sophia.json b/res/trainers/data/swimmer_sophia.json index d84da356aa..0e85638fac 100644 --- a/res/trainers/data/swimmer_sophia.json +++ b/res/trainers/data/swimmer_sophia.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_troy.json b/res/trainers/data/swimmer_troy.json index 88df2667cd..7cb944649b 100644 --- a/res/trainers/data/swimmer_troy.json +++ b/res/trainers/data/swimmer_troy.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_vanessa.json b/res/trainers/data/swimmer_vanessa.json index 598b7fbf4f..3615acec22 100644 --- a/res/trainers/data/swimmer_vanessa.json +++ b/res/trainers/data/swimmer_vanessa.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_vincent.json b/res/trainers/data/swimmer_vincent.json index 7759d2d89a..e746929ecf 100644 --- a/res/trainers/data/swimmer_vincent.json +++ b/res/trainers/data/swimmer_vincent.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_wade.json b/res/trainers/data/swimmer_wade.json index 18108f6c32..87acf762c0 100644 --- a/res/trainers/data/swimmer_wade.json +++ b/res/trainers/data/swimmer_wade.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 56, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_wesley.json b/res/trainers/data/swimmer_wesley.json index 5fa4bab0dc..05a164ae7d 100644 --- a/res/trainers/data/swimmer_wesley.json +++ b/res/trainers/data/swimmer_wesley.json @@ -13,7 +13,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 43, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/swimmer_wesley_rematch.json b/res/trainers/data/swimmer_wesley_rematch.json index 353f6376aa..d78fa0da77 100644 --- a/res/trainers/data/swimmer_wesley_rematch.json +++ b/res/trainers/data/swimmer_wesley_rematch.json @@ -13,7 +13,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 57, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/tower_tycoon_palmer_dummy.json b/res/trainers/data/tower_tycoon_palmer_dummy.json index 2aef545f9b..1fdcbc5e29 100644 --- a/res/trainers/data/tower_tycoon_palmer_dummy.json +++ b/res/trainers/data/tower_tycoon_palmer_dummy.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/tuber_caitlyn.json b/res/trainers/data/tuber_caitlyn.json index e1c2c942e9..c3831fb38d 100644 --- a/res/trainers/data/tuber_caitlyn.json +++ b/res/trainers/data/tuber_caitlyn.json @@ -17,7 +17,7 @@ "MOVE_SLAM", "MOVE_CHARM" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "MOVE_DEFENSE_CURL", "MOVE_AQUA_RING" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -45,7 +45,7 @@ "MOVE_ROLLOUT", "MOVE_AQUA_RING" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/tuber_chelsea.json b/res/trainers/data/tuber_chelsea.json index 5f99eea3fe..2b75283fd0 100644 --- a/res/trainers/data/tuber_chelsea.json +++ b/res/trainers/data/tuber_chelsea.json @@ -13,7 +13,7 @@ "level": 28, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 9 } ], diff --git a/res/trainers/data/tuber_chelsea_rematch_1.json b/res/trainers/data/tuber_chelsea_rematch_1.json index 901c293857..99fc91f491 100644 --- a/res/trainers/data/tuber_chelsea_rematch_1.json +++ b/res/trainers/data/tuber_chelsea_rematch_1.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 9 } ], diff --git a/res/trainers/data/tuber_chelsea_rematch_2.json b/res/trainers/data/tuber_chelsea_rematch_2.json index bd30b946a7..94a9e4afca 100644 --- a/res/trainers/data/tuber_chelsea_rematch_2.json +++ b/res/trainers/data/tuber_chelsea_rematch_2.json @@ -13,7 +13,7 @@ "level": 53, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 9 } ], diff --git a/res/trainers/data/tuber_conner.json b/res/trainers/data/tuber_conner.json index 11332f03fa..9f738798d8 100644 --- a/res/trainers/data/tuber_conner.json +++ b/res/trainers/data/tuber_conner.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/tuber_holly.json b/res/trainers/data/tuber_holly.json index 7a9006d58c..84e4b0e464 100644 --- a/res/trainers/data/tuber_holly.json +++ b/res/trainers/data/tuber_holly.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/tuber_jacky.json b/res/trainers/data/tuber_jacky.json index c831f979c9..a27d2c76aa 100644 --- a/res/trainers/data/tuber_jacky.json +++ b/res/trainers/data/tuber_jacky.json @@ -18,7 +18,7 @@ "MOVE_HYPER_FANG", "MOVE_YAWN" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/tuber_jared.json b/res/trainers/data/tuber_jared.json index dea881f81d..3bbedfc277 100644 --- a/res/trainers/data/tuber_jared.json +++ b/res/trainers/data/tuber_jared.json @@ -13,7 +13,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 26, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 8 } ], diff --git a/res/trainers/data/tuber_jared_rematch_1.json b/res/trainers/data/tuber_jared_rematch_1.json index f70794201b..895ad5a43e 100644 --- a/res/trainers/data/tuber_jared_rematch_1.json +++ b/res/trainers/data/tuber_jared_rematch_1.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 8 } ], diff --git a/res/trainers/data/tuber_jared_rematch_2.json b/res/trainers/data/tuber_jared_rematch_2.json index 3ce02308dd..b7552fb3d1 100644 --- a/res/trainers/data/tuber_jared_rematch_2.json +++ b/res/trainers/data/tuber_jared_rematch_2.json @@ -13,7 +13,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 51, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 8 } ], diff --git a/res/trainers/data/tuber_mariel.json b/res/trainers/data/tuber_mariel.json index 0196aeaabb..8453a133be 100644 --- a/res/trainers/data/tuber_mariel.json +++ b/res/trainers/data/tuber_mariel.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/tuber_trenton.json b/res/trainers/data/tuber_trenton.json index 5d7ea0c1e6..bdd32539f9 100644 --- a/res/trainers/data/tuber_trenton.json +++ b/res/trainers/data/tuber_trenton.json @@ -13,7 +13,7 @@ "level": 31, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/twins_emma_and_lil.json b/res/trainers/data/twins_emma_and_lil.json index 36d49497f6..4efc933eaf 100644 --- a/res/trainers/data/twins_emma_and_lil.json +++ b/res/trainers/data/twins_emma_and_lil.json @@ -13,7 +13,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/twins_liv_and_liz.json b/res/trainers/data/twins_liv_and_liz.json index 805441a841..db87305b52 100644 --- a/res/trainers/data/twins_liv_and_liz.json +++ b/res/trainers/data/twins_liv_and_liz.json @@ -14,7 +14,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -23,7 +23,7 @@ "level": 11, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/twins_teri_and_tia.json b/res/trainers/data/twins_teri_and_tia.json index 0c86715fa4..c490845994 100644 --- a/res/trainers/data/twins_teri_and_tia.json +++ b/res/trainers/data/twins_teri_and_tia.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 20 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 20 } ], diff --git a/res/trainers/data/twins_teri_and_tia_rematch_1.json b/res/trainers/data/twins_teri_and_tia_rematch_1.json index 01d52bb7dc..26c8c2020e 100644 --- a/res/trainers/data/twins_teri_and_tia_rematch_1.json +++ b/res/trainers/data/twins_teri_and_tia_rematch_1.json @@ -13,7 +13,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 20 }, { @@ -22,7 +22,7 @@ "level": 44, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 20 } ], diff --git a/res/trainers/data/twins_teri_and_tia_rematch_2.json b/res/trainers/data/twins_teri_and_tia_rematch_2.json index 1ba272da13..3e9157c372 100644 --- a/res/trainers/data/twins_teri_and_tia_rematch_2.json +++ b/res/trainers/data/twins_teri_and_tia_rematch_2.json @@ -13,7 +13,7 @@ "level": 60, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 20 }, { @@ -22,7 +22,7 @@ "level": 60, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 20 } ], diff --git a/res/trainers/data/veteran_armando.json b/res/trainers/data/veteran_armando.json index 53f516bb89..57510822c8 100644 --- a/res/trainers/data/veteran_armando.json +++ b/res/trainers/data/veteran_armando.json @@ -20,7 +20,7 @@ "MOVE_SLUDGE_BOMB", "MOVE_DARK_PULSE" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ASSURANCE", "MOVE_TAKE_DOWN" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_SURF", "MOVE_FIRE_BLAST" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_armando_rematch.json b/res/trainers/data/veteran_armando_rematch.json index eb52194d0b..3fa59b7b85 100644 --- a/res/trainers/data/veteran_armando_rematch.json +++ b/res/trainers/data/veteran_armando_rematch.json @@ -20,7 +20,7 @@ "MOVE_SWORDS_DANCE", "MOVE_SILVER_WIND" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_NIGHT_SLASH", "MOVE_QUICK_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_SHADOW_CLAW", "MOVE_AERIAL_ACE" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_brenden.json b/res/trainers/data/veteran_brenden.json index f085a0e5da..ae0e478b42 100644 --- a/res/trainers/data/veteran_brenden.json +++ b/res/trainers/data/veteran_brenden.json @@ -20,7 +20,7 @@ "MOVE_STEALTH_ROCK", "MOVE_TOXIC_SPIKES" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_ICE_FANG", "MOVE_DRAGON_PULSE" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_PROTECT", "MOVE_REST" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_brian.json b/res/trainers/data/veteran_brian.json index f1eefeb33a..8ccb80285e 100644 --- a/res/trainers/data/veteran_brian.json +++ b/res/trainers/data/veteran_brian.json @@ -20,7 +20,7 @@ "MOVE_ANCIENT_POWER", "MOVE_TOXIC" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -33,7 +33,7 @@ "MOVE_STOMP", "MOVE_TAKE_DOWN" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -47,7 +47,7 @@ "MOVE_PURSUIT", "MOVE_QUICK_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_brian_rematch_1.json b/res/trainers/data/veteran_brian_rematch_1.json index b284a0aec7..3ff8f29f9a 100644 --- a/res/trainers/data/veteran_brian_rematch_1.json +++ b/res/trainers/data/veteran_brian_rematch_1.json @@ -20,7 +20,7 @@ "MOVE_ANCIENT_POWER", "MOVE_TOXIC" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_TAKE_DOWN", "MOVE_FIRE_BLAST" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_PURSUIT", "MOVE_QUICK_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_brian_rematch_2.json b/res/trainers/data/veteran_brian_rematch_2.json index d261355a3b..607d3adc1c 100644 --- a/res/trainers/data/veteran_brian_rematch_2.json +++ b/res/trainers/data/veteran_brian_rematch_2.json @@ -20,7 +20,7 @@ "MOVE_QUICK_ATTACK", "MOVE_CRUNCH" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_FLARE_BLITZ", "MOVE_BOUNCE" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_ANCIENT_POWER", "MOVE_POWER_WHIP" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_clayton.json b/res/trainers/data/veteran_clayton.json index 4631958c97..8a08469e55 100644 --- a/res/trainers/data/veteran_clayton.json +++ b/res/trainers/data/veteran_clayton.json @@ -20,7 +20,7 @@ "MOVE_DOUBLE_TEAM", "MOVE_GROWL" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_EARTHQUAKE", "MOVE_BRICK_BREAK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_edgar.json b/res/trainers/data/veteran_edgar.json index 3f2d5bef7a..5ada80387b 100644 --- a/res/trainers/data/veteran_edgar.json +++ b/res/trainers/data/veteran_edgar.json @@ -20,7 +20,7 @@ "MOVE_PSYCHIC", "MOVE_THUNDERBOLT" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_TOXIC", "MOVE_SLAM" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_METAL_CLAW", "MOVE_GROWL" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_emanuel.json b/res/trainers/data/veteran_emanuel.json index 051695ddd2..f0bebd7839 100644 --- a/res/trainers/data/veteran_emanuel.json +++ b/res/trainers/data/veteran_emanuel.json @@ -19,7 +19,7 @@ "MOVE_LOW_KICK", "MOVE_FORESIGHT" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_TACKLE", "MOVE_CONFUSE_RAY" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_grant.json b/res/trainers/data/veteran_grant.json index aa1389d3e6..9c7efda392 100644 --- a/res/trainers/data/veteran_grant.json +++ b/res/trainers/data/veteran_grant.json @@ -20,7 +20,7 @@ "MOVE_COUNTER", "MOVE_SCREECH" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_QUICK_ATTACK", "MOVE_GROWL" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_ROCK_POLISH", "MOVE_DEFENSE_CURL" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_harlan.json b/res/trainers/data/veteran_harlan.json index 751fce83e6..dd406888c2 100644 --- a/res/trainers/data/veteran_harlan.json +++ b/res/trainers/data/veteran_harlan.json @@ -20,7 +20,7 @@ "MOVE_CRUNCH", "MOVE_QUICK_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_TOXIC", "MOVE_FLY" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_EXTRASENSORY", "MOVE_QUICK_ATTACK" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/veteran_terrell.json b/res/trainers/data/veteran_terrell.json index 41db8346ad..db850c2e2d 100644 --- a/res/trainers/data/veteran_terrell.json +++ b/res/trainers/data/veteran_terrell.json @@ -20,7 +20,7 @@ "MOVE_SPORE", "MOVE_SLASH" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -34,7 +34,7 @@ "MOVE_EARTHQUAKE", "MOVE_MEGAHORN" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -48,7 +48,7 @@ "MOVE_IRON_TAIL", "MOVE_FOCUS_BLAST" ], - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/waitress_kati.json b/res/trainers/data/waitress_kati.json index f20cfcdc4f..a3989bdeb8 100644 --- a/res/trainers/data/waitress_kati.json +++ b/res/trainers/data/waitress_kati.json @@ -13,7 +13,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_braden.json b/res/trainers/data/worker_braden.json index 6930e86f6b..9f0f2ec97a 100644 --- a/res/trainers/data/worker_braden.json +++ b/res/trainers/data/worker_braden.json @@ -13,7 +13,7 @@ "level": 37, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_brendon.json b/res/trainers/data/worker_brendon.json index c7499dcbc8..d29b91dda7 100644 --- a/res/trainers/data/worker_brendon.json +++ b/res/trainers/data/worker_brendon.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_colin.json b/res/trainers/data/worker_colin.json index eea820de28..694e97748f 100644 --- a/res/trainers/data/worker_colin.json +++ b/res/trainers/data/worker_colin.json @@ -13,7 +13,7 @@ "level": 6, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 8, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_conrad.json b/res/trainers/data/worker_conrad.json index 4a927319b6..a53a9c4144 100644 --- a/res/trainers/data/worker_conrad.json +++ b/res/trainers/data/worker_conrad.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_dillan.json b/res/trainers/data/worker_dillan.json index c894344512..31bc205875 100644 --- a/res/trainers/data/worker_dillan.json +++ b/res/trainers/data/worker_dillan.json @@ -13,7 +13,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 33, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_gary.json b/res/trainers/data/worker_gary.json index da6152ed03..44cc4af200 100644 --- a/res/trainers/data/worker_gary.json +++ b/res/trainers/data/worker_gary.json @@ -16,7 +16,7 @@ "MOVE_SPARK", "MOVE_MAGNET_BOMB" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_gerardo.json b/res/trainers/data/worker_gerardo.json index 1fea6ae5a5..d83141a032 100644 --- a/res/trainers/data/worker_gerardo.json +++ b/res/trainers/data/worker_gerardo.json @@ -17,7 +17,7 @@ "MOVE_MAGNET_BOMB", "MOVE_SPARK" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_MAGNET_BOMB", "MOVE_SPARK" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_holden.json b/res/trainers/data/worker_holden.json index cef8221b1a..ca3c7232e8 100644 --- a/res/trainers/data/worker_holden.json +++ b/res/trainers/data/worker_holden.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_jackson.json b/res/trainers/data/worker_jackson.json index 12e76a57ec..c3c61e1774 100644 --- a/res/trainers/data/worker_jackson.json +++ b/res/trainers/data/worker_jackson.json @@ -17,7 +17,7 @@ "MOVE_SPARK", "MOVE_THUNDER_WAVE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -30,7 +30,7 @@ "MOVE_SPARK", "MOVE_THUNDER_WAVE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -43,7 +43,7 @@ "MOVE_SPARK", "MOVE_THUNDER_WAVE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_mason.json b/res/trainers/data/worker_mason.json index 77f2754455..3c3c9e02cd 100644 --- a/res/trainers/data/worker_mason.json +++ b/res/trainers/data/worker_mason.json @@ -13,7 +13,7 @@ "level": 9, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_noel.json b/res/trainers/data/worker_noel.json index cd8db85219..add4c7aac3 100644 --- a/res/trainers/data/worker_noel.json +++ b/res/trainers/data/worker_noel.json @@ -13,7 +13,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 36, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/worker_quentin.json b/res/trainers/data/worker_quentin.json index 965c56ad5a..967a594f9d 100644 --- a/res/trainers/data/worker_quentin.json +++ b/res/trainers/data/worker_quentin.json @@ -13,7 +13,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 34, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/young_couple_mike_and_nat.json b/res/trainers/data/young_couple_mike_and_nat.json index 096fad44ec..21e94f61b3 100644 --- a/res/trainers/data/young_couple_mike_and_nat.json +++ b/res/trainers/data/young_couple_mike_and_nat.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/young_couple_ty_and_sue.json b/res/trainers/data/young_couple_ty_and_sue.json index a84024e21c..2ec854ae1a 100644 --- a/res/trainers/data/young_couple_ty_and_sue.json +++ b/res/trainers/data/young_couple_ty_and_sue.json @@ -18,7 +18,7 @@ "MOVE_QUICK_ATTACK", "MOVE_DEFENSE_CURL" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_PURSUIT", "MOVE_SONIC_BOOM" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_austin.json b/res/trainers/data/youngster_austin.json index 3114fb4701..0b08acc9d9 100644 --- a/res/trainers/data/youngster_austin.json +++ b/res/trainers/data/youngster_austin.json @@ -13,7 +13,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 18, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_dallas.json b/res/trainers/data/youngster_dallas.json index d8613ca0a7..0769c249f7 100644 --- a/res/trainers/data/youngster_dallas.json +++ b/res/trainers/data/youngster_dallas.json @@ -13,7 +13,7 @@ "level": 8, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_dallas_rematch_1.json b/res/trainers/data/youngster_dallas_rematch_1.json index d0704bfe01..9c94371f11 100644 --- a/res/trainers/data/youngster_dallas_rematch_1.json +++ b/res/trainers/data/youngster_dallas_rematch_1.json @@ -13,7 +13,7 @@ "level": 22, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 22, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_dallas_rematch_2.json b/res/trainers/data/youngster_dallas_rematch_2.json index 5fc90096da..5e6b388792 100644 --- a/res/trainers/data/youngster_dallas_rematch_2.json +++ b/res/trainers/data/youngster_dallas_rematch_2.json @@ -13,7 +13,7 @@ "level": 32, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 32, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 32, "item": null, "moves": null, - "power": 100, + "iv_scale": 100, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_dallas_rematch_3.json b/res/trainers/data/youngster_dallas_rematch_3.json index 0880088b3c..6cc384ff3e 100644 --- a/res/trainers/data/youngster_dallas_rematch_3.json +++ b/res/trainers/data/youngster_dallas_rematch_3.json @@ -13,7 +13,7 @@ "level": 50, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 50, "item": null, "moves": null, - "power": 50, + "iv_scale": 50, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 50, "item": null, "moves": null, - "power": 100, + "iv_scale": 100, "ball_seal": 0 }, { @@ -40,7 +40,7 @@ "level": 50, "item": null, "moves": null, - "power": 150, + "iv_scale": 150, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_darius.json b/res/trainers/data/youngster_darius.json index 94ed9831f9..aa9907d582 100644 --- a/res/trainers/data/youngster_darius.json +++ b/res/trainers/data/youngster_darius.json @@ -16,7 +16,7 @@ "MOVE_TACKLE", "MOVE_DEFENSE_CURL" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -29,7 +29,7 @@ "MOVE_TACKLE", "MOVE_HARDEN" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_donny.json b/res/trainers/data/youngster_donny.json index 95c6633def..a4c179c7b6 100644 --- a/res/trainers/data/youngster_donny.json +++ b/res/trainers/data/youngster_donny.json @@ -18,7 +18,7 @@ "MOVE_CONFUSE_RAY", "MOVE_CURSE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "MOVE_SWALLOW", "MOVE_STOCKPILE" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_jonathon.json b/res/trainers/data/youngster_jonathon.json index 1e874b4561..20976f32b9 100644 --- a/res/trainers/data/youngster_jonathon.json +++ b/res/trainers/data/youngster_jonathon.json @@ -16,7 +16,7 @@ "MOVE_TACKLE", "MOVE_DEFENSE_CURL" ], - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_logan.json b/res/trainers/data/youngster_logan.json index 0bb00039bb..29af6fff3b 100644 --- a/res/trainers/data/youngster_logan.json +++ b/res/trainers/data/youngster_logan.json @@ -15,7 +15,7 @@ "moves": [ "MOVE_TACKLE" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_michael.json b/res/trainers/data/youngster_michael.json index 3e28ce5fd6..03c517b4fe 100644 --- a/res/trainers/data/youngster_michael.json +++ b/res/trainers/data/youngster_michael.json @@ -13,7 +13,7 @@ "level": 7, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 6, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_norman_unused_1.json b/res/trainers/data/youngster_norman_unused_1.json index 0b732f7603..2ab72fbb84 100644 --- a/res/trainers/data/youngster_norman_unused_1.json +++ b/res/trainers/data/youngster_norman_unused_1.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_norman_unused_2.json b/res/trainers/data/youngster_norman_unused_2.json index 5b5d2dc4a1..1af879ffd5 100644 --- a/res/trainers/data/youngster_norman_unused_2.json +++ b/res/trainers/data/youngster_norman_unused_2.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 25, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_norman_unused_3.json b/res/trainers/data/youngster_norman_unused_3.json index 9c172c5a89..3ef72218ad 100644 --- a/res/trainers/data/youngster_norman_unused_3.json +++ b/res/trainers/data/youngster_norman_unused_3.json @@ -18,7 +18,7 @@ "MOVE_GROWL", "MOVE_PECK" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -32,7 +32,7 @@ "MOVE_MAGICAL_LEAF", "MOVE_HELPING_HAND" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_oliver.json b/res/trainers/data/youngster_oliver.json index c38e46731b..f4fb33c43b 100644 --- a/res/trainers/data/youngster_oliver.json +++ b/res/trainers/data/youngster_oliver.json @@ -13,7 +13,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 19, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 21, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_roland_unused_1.json b/res/trainers/data/youngster_roland_unused_1.json index 8e09eb1d99..47c84b7431 100644 --- a/res/trainers/data/youngster_roland_unused_1.json +++ b/res/trainers/data/youngster_roland_unused_1.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_roland_unused_2.json b/res/trainers/data/youngster_roland_unused_2.json index ba758adff5..b7aa87a82d 100644 --- a/res/trainers/data/youngster_roland_unused_2.json +++ b/res/trainers/data/youngster_roland_unused_2.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_roland_unused_3.json b/res/trainers/data/youngster_roland_unused_3.json index 9a0d7523a2..b4ba05c0b1 100644 --- a/res/trainers/data/youngster_roland_unused_3.json +++ b/res/trainers/data/youngster_roland_unused_3.json @@ -13,7 +13,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 23, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_sebastian.json b/res/trainers/data/youngster_sebastian.json index 9134b5f159..5e7da8add6 100644 --- a/res/trainers/data/youngster_sebastian.json +++ b/res/trainers/data/youngster_sebastian.json @@ -16,7 +16,7 @@ "MOVE_LOW_KICK", "MOVE_LEER" ], - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_tristan.json b/res/trainers/data/youngster_tristan.json index 66118d4478..caaf96ca52 100644 --- a/res/trainers/data/youngster_tristan.json +++ b/res/trainers/data/youngster_tristan.json @@ -13,7 +13,7 @@ "level": 5, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_tristan_rematch_1.json b/res/trainers/data/youngster_tristan_rematch_1.json index c88c42c402..ab5c02edd4 100644 --- a/res/trainers/data/youngster_tristan_rematch_1.json +++ b/res/trainers/data/youngster_tristan_rematch_1.json @@ -13,7 +13,7 @@ "level": 24, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_tristan_rematch_2.json b/res/trainers/data/youngster_tristan_rematch_2.json index e0212879ba..626e3e4486 100644 --- a/res/trainers/data/youngster_tristan_rematch_2.json +++ b/res/trainers/data/youngster_tristan_rematch_2.json @@ -13,7 +13,7 @@ "level": 35, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_tristan_rematch_3.json b/res/trainers/data/youngster_tristan_rematch_3.json index ab7e52a595..3326e886c1 100644 --- a/res/trainers/data/youngster_tristan_rematch_3.json +++ b/res/trainers/data/youngster_tristan_rematch_3.json @@ -13,7 +13,7 @@ "level": 45, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_tyler.json b/res/trainers/data/youngster_tyler.json index 36f5b32351..97f789c49f 100644 --- a/res/trainers/data/youngster_tyler.json +++ b/res/trainers/data/youngster_tyler.json @@ -13,7 +13,7 @@ "level": 8, "item": null, "moves": null, - "power": 10, + "iv_scale": 10, "ball_seal": 0 } ], diff --git a/res/trainers/data/youngster_wayne.json b/res/trainers/data/youngster_wayne.json index 741cff72df..638fc56fe0 100644 --- a/res/trainers/data/youngster_wayne.json +++ b/res/trainers/data/youngster_wayne.json @@ -13,7 +13,7 @@ "level": 17, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -22,7 +22,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 }, { @@ -31,7 +31,7 @@ "level": 20, "item": null, "moves": null, - "power": 0, + "iv_scale": 0, "ball_seal": 0 } ], diff --git a/src/trainer_data.c b/src/trainer_data.c index daad3d8145..51ee0186c5 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -203,7 +203,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID u16 species = trmon[i].species & 0x3FF; u8 form = (trmon[i].species & 0xFC00) >> TRAINER_MON_FORM_SHIFT; - rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; + rnd = trmon[i].ivScale + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); for (j = 0; j < dto->trainer[battler].header.trainerType; j++) { @@ -211,7 +211,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID } rnd = (rnd << 8) + genderMod; - ivs = trmon[i].dv * MAX_IVS_SINGLE_STAT / MAX_DV; + ivs = trmon[i].ivScale * MAX_IVS_SINGLE_STAT / MAX_IV_SCALE; Pokemon_InitWith(mon, species, trmon[i].level, ivs, TRUE, rnd, OTID_NOT_SHINY, 0); Pokemon_SetBallSeal(trmon[i].cbSeal, mon, heapID); @@ -228,7 +228,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID u16 species = trmon[i].species & 0x3FF; u8 form = (trmon[i].species & 0xFC00) >> TRAINER_MON_FORM_SHIFT; - rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; + rnd = trmon[i].ivScale + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); for (j = 0; j < dto->trainer[battler].header.trainerType; j++) { @@ -236,7 +236,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID } rnd = (rnd << 8) + genderMod; - ivs = trmon[i].dv * MAX_IVS_SINGLE_STAT / MAX_DV; + ivs = trmon[i].ivScale * MAX_IVS_SINGLE_STAT / MAX_IV_SCALE; Pokemon_InitWith(mon, species, trmon[i].level, ivs, TRUE, rnd, OTID_NOT_SHINY, 0); @@ -258,7 +258,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID u16 species = trmon[i].species & 0x3FF; u8 form = (trmon[i].species & 0xFC00) >> TRAINER_MON_FORM_SHIFT; - rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; + rnd = trmon[i].ivScale + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); for (j = 0; j < dto->trainer[battler].header.trainerType; j++) { @@ -266,7 +266,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID } rnd = (rnd << 8) + genderMod; - ivs = trmon[i].dv * MAX_IVS_SINGLE_STAT / MAX_DV; + ivs = trmon[i].ivScale * MAX_IVS_SINGLE_STAT / MAX_IV_SCALE; Pokemon_InitWith(mon, species, trmon[i].level, ivs, TRUE, rnd, OTID_NOT_SHINY, 0); Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &trmon[i].item); @@ -284,7 +284,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID u16 species = trmon[i].species & 0x3FF; u8 form = (trmon[i].species & 0xFC00) >> TRAINER_MON_FORM_SHIFT; - rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; + rnd = trmon[i].ivScale + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); for (j = 0; j < dto->trainer[battler].header.trainerType; j++) { @@ -292,7 +292,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, enum HeapID } rnd = (rnd << 8) + genderMod; - ivs = trmon[i].dv * MAX_IVS_SINGLE_STAT / MAX_DV; + ivs = trmon[i].ivScale * MAX_IVS_SINGLE_STAT / MAX_IV_SCALE; Pokemon_InitWith(mon, species, trmon[i].level, ivs, TRUE, rnd, OTID_NOT_SHINY, 0); Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &trmon[i].item); diff --git a/tools/datagen/datagen_trainer.cpp b/tools/datagen/datagen_trainer.cpp index 1abc73b903..d5dbadc45f 100644 --- a/tools/datagen/datagen_trainer.cpp +++ b/tools/datagen/datagen_trainer.cpp @@ -122,7 +122,7 @@ static void PackImmediately(const rapidjson::Value &member, TrainerMonBase &base static void ParseMovesAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp) { TrainerMonWithMoves withMoves = {}; - withMoves.dv = base.dv; + withMoves.ivScale = base.ivScale; withMoves.level = base.level; withMoves.species = base.species; withMoves.cbSeal = base.cbSeal; @@ -138,7 +138,7 @@ static void ParseMovesAndPack(const rapidjson::Value &member, TrainerMonBase &ba static void ParseItemAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp) { TrainerMonWithItem withItem = {}; - withItem.dv = base.dv; + withItem.ivScale = base.ivScale; withItem.level = base.level; withItem.species = base.species; withItem.cbSeal = base.cbSeal; @@ -151,7 +151,7 @@ static void ParseItemAndPack(const rapidjson::Value &member, TrainerMonBase &bas static void ParseMovesAndItemAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp) { TrainerMonWithMovesAndItem withMovesAndItem = {}; - withMovesAndItem.dv = base.dv; + withMovesAndItem.ivScale = base.ivScale; withMovesAndItem.level = base.level; withMovesAndItem.species = base.species; withMovesAndItem.cbSeal = base.cbSeal; @@ -184,7 +184,7 @@ static void ParseAndPackParty(const rapidjson::Document &doc, TrainerDataType mo for (const auto &member : doc["party"].GetArray()) { TrainerMonBase base = {}; - base.dv = member["power"].GetUint(); + base.ivScale = member["iv_scale"].GetUint(); base.level = member["level"].GetUint(); base.species = LookupConst(member["species"].GetString(), Species); base.species |= (member["form"].GetUint() << TRAINER_MON_FORM_SHIFT); @@ -315,7 +315,7 @@ int main(int argc, char **argv) nameMessage.AddMember("en_US", string, namesTextBank.GetAllocator()); nameMessages.PushBack(nameMessage, namesTextBank.GetAllocator()); - + if (trMsg.length()) { if (trainerID < VANILLA_TRAINER_COUNT && trtblIndices[trainerID] != -1) { trMsgs[trtblIndices[trainerID]] = trMsg; @@ -333,7 +333,7 @@ int main(int argc, char **argv) trainerID++; } - + namesTextBank.AddMember("messages", nameMessages, namesTextBank.GetAllocator()); std::string str = "";