Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-03-21 17:55:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename all instances of difficulty values and "power" to iv_scale for clarity (#952)

Browse Source
This commit is contained in:
Kalaay 2026-02-20 20:56:06 +01:00 committed by GitHub
parent e21058dfa0
commit 0a883cb6c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
930 changed files with 1897 additions and 1897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/struct_defs/trainer_data.h
View File

@ -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;

4
res/trainers/data/ace_trainer_abel.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_alicia.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_allen.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_alyssa.json
View File

@ -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
}
],

2
res/trainers/data/ace_trainer_anton.json
View File

@ -18,7 +18,7 @@
"MOVE_ICE_BEAM",
"MOVE_CRUNCH"
],
"power": 50,
"iv_scale": 50,
"ball_seal": 0
}
],

6
res/trainers/data/ace_trainer_arthur.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_blake.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_brandi.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_breanna.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_brenda.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_brenna.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_catherine.json
View File

@ -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
}
],

2
res/trainers/data/ace_trainer_cesar.json
View File

@ -20,7 +20,7 @@
"MOVE_SLASH",
"MOVE_PURSUIT"
],
"power": 60,
"iv_scale": 60,
"ball_seal": 0
}
],

6
res/trainers/data/ace_trainer_clarice.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_dalton.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_dalton_rematch.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_dana.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_deanna.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_deanna_rematch.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_dennis.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_dennis_rematch_1.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_dennis_rematch_2.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_destiny.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_ernest.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_felix.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_garrett.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_graham.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_henry.json
View File

@ -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
}
],

2
res/trainers/data/ace_trainer_isaiah.json
View File

@ -20,7 +20,7 @@
"MOVE_ICE_FANG",
"MOVE_ANCIENT_POWER"
],
"power": 60,
"iv_scale": 60,
"ball_seal": 0
}
],

4
res/trainers/data/ace_trainer_jake.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_jake_rematch.json
View File

@ -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
}
],

2
res/trainers/data/ace_trainer_jamie.json
View File

@ -20,7 +20,7 @@
"MOVE_PSYCHIC",
"MOVE_MAGNET_RISE"
],
"power": 50,
"iv_scale": 50,
"ball_seal": 11
}
],

2
res/trainers/data/ace_trainer_jasmin.json
View File

@ -20,7 +20,7 @@
"MOVE_X_SCISSOR",
"MOVE_AERIAL_ACE"
],
"power": 50,
"iv_scale": 50,
"ball_seal": 0
}
],

6
res/trainers/data/ace_trainer_jonah.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_jose.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_kassandra.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_keenan.json
View File

@ -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
}
],

2
res/trainers/data/ace_trainer_laura.json
View File

@ -20,7 +20,7 @@
"MOVE_MAGICAL_LEAF",
"MOVE_SWEET_SCENT"
],
"power": 50,
"iv_scale": 50,
"ball_seal": 0
}
],

6
res/trainers/data/ace_trainer_maria.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_mariah.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_maya.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_maya_rematch_1.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_maya_rematch_2.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_meagan.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_micah.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_mikayla.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_moira.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_moira_rematch.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_monique.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_natasha.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_olivia.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_olivia_rematch.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_omar.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_quinn.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_rodolfo.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_rodolfo_rematch.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_ruben.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_sandra.json
View File

@ -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
}
],

2
res/trainers/data/ace_trainer_saul.json
View File

@ -20,7 +20,7 @@
"MOVE_SWAGGER",
"MOVE_PAYBACK"
],
"power": 50,
"iv_scale": 50,
"ball_seal": 12
}
],

2
res/trainers/data/ace_trainer_saul_rematch.json
View File

@ -20,7 +20,7 @@
"MOVE_EARTHQUAKE",
"MOVE_STONE_EDGE"
],
"power": 50,
"iv_scale": 50,
"ball_seal": 12
}
],

6
res/trainers/data/ace_trainer_savannah.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_sergio.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_shannon.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_shannon_rematch.json
View File

@ -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
}
],

6
res/trainers/data/ace_trainer_skylar.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_stefan.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_sydney.json
View File

@ -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
}
],

4
res/trainers/data/ace_trainer_zachery.json
View File

@ -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
}
],

2
res/trainers/data/arcade_star_dahlia_dummy.json
View File

@ -13,7 +13,7 @@
"level": 5,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

2
res/trainers/data/aroma_lady_alison.json
View File

@ -14,7 +14,7 @@
"level": 28,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

2
res/trainers/data/aroma_lady_angela.json
View File

@ -18,7 +18,7 @@
"MOVE_POISON_STING",
"MOVE_STUN_SPORE"
],
"power": 20,
"iv_scale": 20,
"ball_seal": 0
}
],

2
res/trainers/data/aroma_lady_elizabeth.json
View File

@ -17,7 +17,7 @@
"MOVE_GROWTH",
"MOVE_MEGA_DRAIN"
],
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

2
res/trainers/data/aroma_lady_elizabeth_rematch_1.json
View File

@ -14,7 +14,7 @@
"level": 24,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

2
res/trainers/data/aroma_lady_elizabeth_rematch_2.json
View File

@ -14,7 +14,7 @@
"level": 35,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

2
res/trainers/data/aroma_lady_elizabeth_rematch_3.json
View File

@ -14,7 +14,7 @@
"level": 54,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

4
res/trainers/data/aroma_lady_hannah.json
View File

@ -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
}
],

6
res/trainers/data/aroma_lady_jenna.json
View File

@ -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
}
],

4
res/trainers/data/aroma_lady_taylor.json
View File

@ -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
}
],

2
res/trainers/data/artist_ismael.json
View File

@ -13,7 +13,7 @@
"level": 28,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

4
res/trainers/data/artist_william.json
View File

@ -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
}
],

4
res/trainers/data/artist_william_rematch_1.json
View File

@ -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
}
],

4
res/trainers/data/artist_william_rematch_2.json
View File

@ -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
}
],

6
res/trainers/data/artist_william_rematch_3.json
View File

@ -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
}
],

4
res/trainers/data/battle_girl_helen.json
View File

@ -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
}
],

4
res/trainers/data/battle_girl_helen_rematch_1.json
View File

@ -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
}
],

4
res/trainers/data/battle_girl_helen_rematch_2.json
View File

@ -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
}
],

4
res/trainers/data/battle_girl_helen_rematch_3.json
View File

@ -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
}
],

2
res/trainers/data/battle_girl_kelsey.json
View File

@ -14,7 +14,7 @@
"level": 15,
"item": null,
"moves": null,
"power": 20,
"iv_scale": 20,
"ball_seal": 0
}
],

2
res/trainers/data/battle_girl_tyler.json
View File

@ -14,7 +14,7 @@
"level": 38,
"item": null,
"moves": null,
"power": 30,
"iv_scale": 30,
"ball_seal": 0
}
],

2
res/trainers/data/beauty_cyndy.json
View File

@ -13,7 +13,7 @@
"level": 29,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

2
res/trainers/data/beauty_cyndy_rematch_1.json
View File

@ -13,7 +13,7 @@
"level": 45,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

6
res/trainers/data/beauty_cyndy_rematch_2.json
View File

@ -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
}
],

6
res/trainers/data/beauty_devon.json
View File

@ -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
}
],

2
res/trainers/data/beauty_gabriella.json
View File

@ -13,7 +13,7 @@
"level": 26,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

2
res/trainers/data/beauty_harley.json
View File

@ -13,7 +13,7 @@
"level": 26,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

2
res/trainers/data/beauty_lindsay.json
View File

@ -17,7 +17,7 @@
"MOVE_POISON_STING",
"MOVE_STUN_SPORE"
],
"power": 20,
"iv_scale": 20,
"ball_seal": 0
}
],

2
res/trainers/data/beauty_nicola.json
View File

@ -13,7 +13,7 @@
"level": 45,
"item": null,
"moves": null,
"power": 0,
"iv_scale": 0,
"ball_seal": 0
}
],

4
res/trainers/data/belle_and_pa_ava_and_matt.json
View File

@ -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
}
],

4
res/trainers/data/belle_and_pa_beth_and_bob.json
View File

@ -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
}
],

Some files were not shown because too many files have changed in this diff Show More