Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Gen 6 contest combos (#8251)

Browse Source
This commit is contained in:
Frank DeBlasio 2025-11-14 12:24:33 -05:00 committed by GitHub
parent 1683b1ff59
commit ca575f2701
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 212 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
include/constants/contest.h
View File

@ -160,93 +160,127 @@
#define CONTEST_EFFECT_TYPE_TURN_ORDER 6 #define CONTEST_EFFECT_TYPE_TURN_ORDER 6
#define CONTEST_EFFECT_TYPE_UNKNOWN 8 #define CONTEST_EFFECT_TYPE_UNKNOWN 8
#define COMBO_STARTER_POUND 1 enum {
#define COMBO_STARTER_FIRE_PUNCH 2 COMBO_STARTER_POUND,
#define COMBO_STARTER_ICE_PUNCH 3 COMBO_STARTER_FIRE_PUNCH,
#define COMBO_STARTER_THUNDER_PUNCH 4 COMBO_STARTER_ICE_PUNCH,
#define COMBO_STARTER_SCRATCH 5 COMBO_STARTER_THUNDER_PUNCH,
#define COMBO_STARTER_VICE_GRIP 6 COMBO_STARTER_SCRATCH,
#define COMBO_STARTER_SWORDS_DANCE 7 COMBO_STARTER_VICE_GRIP,
#define COMBO_STARTER_SAND_ATTACK 8 COMBO_STARTER_SWORDS_DANCE,
#define COMBO_STARTER_HORN_ATTACK 9 COMBO_STARTER_SAND_ATTACK,
#define COMBO_STARTER_LEER 10 COMBO_STARTER_HORN_ATTACK,
#define COMBO_STARTER_SING 11 COMBO_STARTER_LEER,
#define COMBO_STARTER_SURF 12 COMBO_STARTER_SING,
#define COMBO_STARTER_PECK 13 COMBO_STARTER_SURF,
#define COMBO_STARTER_LEECH_SEED 14 COMBO_STARTER_PECK,
#define COMBO_STARTER_GROWTH 15 COMBO_STARTER_LEECH_SEED,
#define COMBO_STARTER_STRING_SHOT 16 COMBO_STARTER_GROWTH,
#define COMBO_STARTER_DRAGON_RAGE 17 COMBO_STARTER_STRING_SHOT,
#define COMBO_STARTER_ROCK_THROW 18 COMBO_STARTER_DRAGON_RAGE,
#define COMBO_STARTER_EARTHQUAKE 19 COMBO_STARTER_ROCK_THROW,
#define COMBO_STARTER_TOXIC 20 COMBO_STARTER_EARTHQUAKE,
#define COMBO_STARTER_CONFUSION 21 COMBO_STARTER_TOXIC,
#define COMBO_STARTER_PSYCHIC 22 COMBO_STARTER_CONFUSION,
#define COMBO_STARTER_HYPNOSIS 23 COMBO_STARTER_PSYCHIC,
#define COMBO_STARTER_RAGE 24 COMBO_STARTER_HYPNOSIS,
#define COMBO_STARTER_DOUBLE_TEAM 25 COMBO_STARTER_RAGE,
#define COMBO_STARTER_HARDEN 26 COMBO_STARTER_DOUBLE_TEAM,
#define COMBO_STARTER_DEFENSE_CURL 27 COMBO_STARTER_HARDEN,
#define COMBO_STARTER_FOCUS_ENERGY 28 COMBO_STARTER_DEFENSE_CURL,
#define COMBO_STARTER_SMOG 29 COMBO_STARTER_FOCUS_ENERGY,
#define COMBO_STARTER_SLUDGE 30 COMBO_STARTER_SMOG,
#define COMBO_STARTER_BONE_CLUB 31 COMBO_STARTER_SLUDGE,
#define COMBO_STARTER_KINESIS 32 COMBO_STARTER_BONE_CLUB,
#define COMBO_STARTER_SOFT_BOILED 33 COMBO_STARTER_KINESIS,
#define COMBO_STARTER_BONEMERANG 34 COMBO_STARTER_SOFT_BOILED,
#define COMBO_STARTER_REST 35 COMBO_STARTER_BONEMERANG,
#define COMBO_STARTER_MIND_READER 36 COMBO_STARTER_REST,
#define COMBO_STARTER_CURSE 37 COMBO_STARTER_MIND_READER,
#define COMBO_STARTER_POWDER_SNOW 38 COMBO_STARTER_CURSE,
#define COMBO_STARTER_SCARY_FACE 39 COMBO_STARTER_POWDER_SNOW,
#define COMBO_STARTER_BELLY_DRUM 40 COMBO_STARTER_SCARY_FACE,
#define COMBO_STARTER_SLUDGE_BOMB 41 COMBO_STARTER_BELLY_DRUM,
#define COMBO_STARTER_MUD_SLAP 42 COMBO_STARTER_SLUDGE_BOMB,
#define COMBO_STARTER_BONE_RUSH 43 COMBO_STARTER_MUD_SLAP,
#define COMBO_STARTER_LOCK_ON 44 COMBO_STARTER_BONE_RUSH,
#define COMBO_STARTER_SANDSTORM 45 COMBO_STARTER_LOCK_ON,
#define COMBO_STARTER_ENDURE 46 COMBO_STARTER_SANDSTORM,
#define COMBO_STARTER_CHARM 47 COMBO_STARTER_ENDURE,
#define COMBO_STARTER_MEAN_LOOK 48 COMBO_STARTER_CHARM,
#define COMBO_STARTER_HEAL_BELL 49 COMBO_STARTER_MEAN_LOOK,
#define COMBO_STARTER_DRAGON_BREATH 50 COMBO_STARTER_HEAL_BELL,
#define COMBO_STARTER_SWEET_SCENT 51 COMBO_STARTER_DRAGON_BREATH,
#define COMBO_STARTER_RAIN_DANCE 52 COMBO_STARTER_SWEET_SCENT,
#define COMBO_STARTER_SUNNY_DAY 53 COMBO_STARTER_RAIN_DANCE,
#define COMBO_STARTER_FAKE_OUT 54 COMBO_STARTER_SUNNY_DAY,
#define COMBO_STARTER_STOCKPILE 55 COMBO_STARTER_FAKE_OUT,
#define COMBO_STARTER_HAIL 56 COMBO_STARTER_STOCKPILE,
#define COMBO_STARTER_CHARGE 57 COMBO_STARTER_HAIL,
#define COMBO_STARTER_TAUNT 58 COMBO_STARTER_CHARGE,
#define COMBO_STARTER_REVENGE 59 COMBO_STARTER_TAUNT,
#define COMBO_STARTER_YAWN 60 COMBO_STARTER_REVENGE,
#define COMBO_STARTER_DIVE 61 COMBO_STARTER_YAWN,
#define COMBO_STARTER_MUD_SPORT 62 COMBO_STARTER_DIVE,
#define COMBO_STARTER_METAL_SOUND 63 COMBO_STARTER_MUD_SPORT,
#define COMBO_STARTER_WATER_SPORT 64 COMBO_STARTER_METAL_SOUND,
#define COMBO_STARTER_CALM_MIND 65 COMBO_STARTER_WATER_SPORT,
#define COMBO_STARTER_DRAGON_DANCE 66 COMBO_STARTER_CALM_MIND,
#define COMBO_STARTER_PAYBACK 67 COMBO_STARTER_DRAGON_DANCE,
#define COMBO_STARTER_LUCKY_CHANT 68 COMBO_STARTER_PAYBACK,
#define COMBO_STARTER_WORRY_SEED 69 COMBO_STARTER_LUCKY_CHANT,
#define COMBO_STARTER_DRAGON_RUSH 70 COMBO_STARTER_WORRY_SEED,
#define COMBO_STARTER_BRAVE_BIRD 71 COMBO_STARTER_DRAGON_RUSH,
#define COMBO_STARTER_THUNDER_FANG 72 COMBO_STARTER_BRAVE_BIRD,
#define COMBO_STARTER_ICE_FANG 73 COMBO_STARTER_THUNDER_FANG,
#define COMBO_STARTER_FIRE_FANG 74 COMBO_STARTER_ICE_FANG,
#define COMBO_STARTER_ATTACK_ORDER 75 COMBO_STARTER_FIRE_FANG,
#define COMBO_STARTER_DEFEND_ORDER 76 COMBO_STARTER_ATTACK_ORDER,
#define COMBO_STARTER_HEAL_ORDER 77 COMBO_STARTER_DEFEND_ORDER,
#define COMBO_STARTER_SCALD 78 COMBO_STARTER_HEAL_ORDER,
#define COMBO_STARTER_DRAGON_TAIL 79 COMBO_STARTER_SCALD,
#define COMBO_STARTER_HYPERSPACE_HOLE 80 COMBO_STARTER_DRAGON_TAIL,
#define COMBO_STARTER_THOUSAND_ARROWS 81 COMBO_STARTER_HYPERSPACE_HOLE,
#define COMBO_STARTER_THOUSAND_WAVES 82 COMBO_STARTER_THOUSAND_ARROWS,
#define COMBO_STARTER_HYPERSPACE_FURY 83 COMBO_STARTER_THOUSAND_WAVES,
#define COMBO_STARTER_SHADOW_BONE 84 COMBO_STARTER_HYPERSPACE_FURY,
#define COMBO_STARTER_ELECTRIC_TERRAIN 85 COMBO_STARTER_SHADOW_BONE,
#define COMBO_STARTER_MISTY_TERRAIN 86 COMBO_STARTER_ELECTRIC_TERRAIN,
#define COMBO_STARTER_GRASSY_TERRAIN 87 COMBO_STARTER_MISTY_TERRAIN,
#define COMBO_STARTER_PSYCHIC_TERRAIN 88 COMBO_STARTER_GRASSY_TERRAIN,
COMBO_STARTER_PSYCHIC_TERRAIN,
COMBO_STARTER_FORCE_PALM,
COMBO_STARTER_THUNDER_WAVE,
COMBO_STARTER_AGILITY,
COMBO_STARTER_STEALTH_ROCK,
COMBO_STARTER_INFERNO,
COMBO_STARTER_WILL_O_WISP,
COMBO_STARTER_LOVELY_KISS,
COMBO_STARTER_SPORE,
COMBO_STARTER_CELEBRATE,
COMBO_STARTER_COVET,
COMBO_STARTER_HAPPY_HOUR,
COMBO_STARTER_WISH,
COMBO_STARTER_AMNESIA,
COMBO_STARTER_HONE_CLAWS,
COMBO_STARTER_ENTRAINMENT,
COMBO_STARTER_PLAY_NICE,
COMBO_STARTER_BLOCK,
COMBO_STARTER_ENCORE,
COMBO_STARTER_DARK_VOID,
COMBO_STARTER_GRASS_WHISTLE,
COMBO_STARTER_SLEEP_POWDER,
COMBO_STARTER_POISON_GAS,
COMBO_STARTER_POISON_POWDER,
COMBO_STARTER_NASTY_PLOT,
COMBO_STARTER_PARABOLIC_CHARGE,
COMBO_STARTER_SHIFT_GEAR,
COMBO_STARTER_SPIKES,
COMBO_STARTER_TOXIC_SPIKES,
COMBO_STARTER_GLARE,
COMBO_STARTER_ROCK_POLISH,
COMBO_STARTER_ROTOTILLER,
COMBO_STARTER_TORMENT,
};
#endif // GUARD_CONSTANTS_CONTEST_H #endif // GUARD_CONSTANTS_CONTEST_H

2
include/contest_effect.h
View File

@ -1,6 +1,6 @@
#ifndef GUARD_CONTEST_EFFECT_H #ifndef GUARD_CONTEST_EFFECT_H
#define GUARD_CONTEST_EFFECT_H #define GUARD_CONTEST_EFFECT_H
#define MAX_COMBO_MOVES 5 #define MAX_COMBO_MOVES 17
struct ContestEffect struct ContestEffect
{ {

178
src/data/moves_info.h
View File

@ -580,7 +580,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_NEXT_APPEAL_LATER : CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_NEXT_APPEAL_LATER : CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_STEALTH_ROCK, COMBO_STARTER_SPIKES, COMBO_STARTER_TOXIC_SPIKES},
.battleAnimScript = gBattleAnimMove_Whirlwind, .battleAnimScript = gBattleAnimMove_Whirlwind,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -1302,7 +1302,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_NEXT_APPEAL_LATER : CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_NEXT_APPEAL_LATER : CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_STEALTH_ROCK, COMBO_STARTER_ENTRAINMENT, COMBO_STARTER_PLAY_NICE, COMBO_STARTER_SPIKES, COMBO_STARTER_TOXIC_SPIKES},
.battleAnimScript = gBattleAnimMove_Roar, .battleAnimScript = gBattleAnimMove_Roar,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -1877,7 +1877,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_LAST : CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_LAST : CONTEST_EFFECT_AVOID_STARTLE_ONCE,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_TAUNT}, .contestComboMoves = {COMBO_STARTER_TAUNT, COMBO_STARTER_ENCORE, COMBO_STARTER_TORMENT},
.battleAnimScript = gBattleAnimMove_Counter, .battleAnimScript = gBattleAnimMove_Counter,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -1901,7 +1901,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_REPETITION_NOT_BORING : CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_REPETITION_NOT_BORING : CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_FAKE_OUT}, .contestComboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_ENTRAINMENT, COMBO_STARTER_PLAY_NICE},
.battleAnimScript = gBattleAnimMove_SeismicToss, .battleAnimScript = gBattleAnimMove_SeismicToss,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -1995,7 +1995,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS : CONTEST_EFFECT_STARTLE_PREV_MONS, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS : CONTEST_EFFECT_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = COMBO_STARTER_LEECH_SEED, .contestComboStarterId = COMBO_STARTER_LEECH_SEED,
.contestComboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_WORRY_SEED}, .contestComboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_WORRY_SEED, COMBO_STARTER_ROTOTILLER},
.battleAnimScript = gBattleAnimMove_LeechSeed, .battleAnimScript = gBattleAnimMove_LeechSeed,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -2026,7 +2026,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = COMBO_STARTER_GROWTH, .contestComboStarterId = COMBO_STARTER_GROWTH,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY},
.battleAnimScript = gBattleAnimMove_Growth, .battleAnimScript = gBattleAnimMove_Growth,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -2100,7 +2100,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.powderMove = TRUE, .powderMove = TRUE,
.contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_POISON_POWDER,
.contestComboMoves = {COMBO_STARTER_SWEET_SCENT}, .contestComboMoves = {COMBO_STARTER_SWEET_SCENT},
.battleAnimScript = gBattleAnimMove_PoisonPowder, .battleAnimScript = gBattleAnimMove_PoisonPowder,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -2152,7 +2152,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.powderMove = TRUE, .powderMove = TRUE,
.contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_SLEEP_POWDER,
.contestComboMoves = {COMBO_STARTER_SWEET_SCENT}, .contestComboMoves = {COMBO_STARTER_SWEET_SCENT},
.battleAnimScript = gBattleAnimMove_SleepPowder, .battleAnimScript = gBattleAnimMove_SleepPowder,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -2337,7 +2337,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS : CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS : CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_THUNDER_WAVE,
.contestComboMoves = {COMBO_STARTER_CHARGE}, .contestComboMoves = {COMBO_STARTER_CHARGE},
.battleAnimScript = gBattleAnimMove_ThunderWave, .battleAnimScript = gBattleAnimMove_ThunderWave,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -2617,7 +2617,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.snatchAffected = TRUE, .snatchAffected = TRUE,
.contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_AGILITY,
.contestComboMoves = {COMBO_STARTER_DOUBLE_TEAM}, .contestComboMoves = {COMBO_STARTER_DOUBLE_TEAM},
.battleAnimScript = gBattleAnimMove_Agility, .battleAnimScript = gBattleAnimMove_Agility,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -3228,7 +3228,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_BLOCK},
.battleAnimScript = gBattleAnimMove_SelfDestruct, .battleAnimScript = gBattleAnimMove_SelfDestruct,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -3561,7 +3561,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.snatchAffected = TRUE, .snatchAffected = TRUE,
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_AVOID_STARTLE : CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_AVOID_STARTLE : CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_AMNESIA,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Amnesia, .battleAnimScript = gBattleAnimMove_Amnesia,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -3673,7 +3673,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_SAME_TYPE : CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_SAME_TYPE : CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_GLARE,
.contestComboMoves = {COMBO_STARTER_LEER}, .contestComboMoves = {COMBO_STARTER_LEER},
.battleAnimScript = gBattleAnimMove_Glare, .battleAnimScript = gBattleAnimMove_Glare,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -3698,7 +3698,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS, .contestEffect = CONTEST_EFFECT_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_HYPNOSIS}, .contestComboMoves = {COMBO_STARTER_CALM_MIND, COMBO_STARTER_HYPNOSIS, COMBO_STARTER_LOVELY_KISS, COMBO_STARTER_SPORE, COMBO_STARTER_SING, COMBO_STARTER_YAWN, COMBO_STARTER_DARK_VOID, COMBO_STARTER_GRASS_WHISTLE, COMBO_STARTER_SLEEP_POWDER},
.battleAnimScript = gBattleAnimMove_DreamEater, .battleAnimScript = gBattleAnimMove_DreamEater,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -3732,7 +3732,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION : CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION : CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_POISON_GAS,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_PoisonGas, .battleAnimScript = gBattleAnimMove_PoisonGas,
}, },
@ -3803,7 +3803,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, //C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_QUICKLY_GROW_BORED : .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, //C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_QUICKLY_GROW_BORED :
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_LOVELY_KISS,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_LovelyKiss, .battleAnimScript = gBattleAnimMove_LovelyKiss,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -3945,7 +3945,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.powderMove = TRUE, .powderMove = TRUE,
.contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_SPORE,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Spore, .battleAnimScript = gBattleAnimMove_Spore,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -4091,7 +4091,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_BLOCK},
.battleAnimScript = gBattleAnimMove_Explosion, .battleAnimScript = gBattleAnimMove_Explosion,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -4504,7 +4504,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.metronomeBanned = TRUE, .metronomeBanned = TRUE,
.copycatBanned = TRUE, .copycatBanned = TRUE,
.assistBanned = TRUE, .assistBanned = TRUE,
.contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE : CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {0},
@ -4579,7 +4579,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_LOVELY_KISS, COMBO_STARTER_SPORE, COMBO_STARTER_SING, COMBO_STARTER_YAWN, COMBO_STARTER_HYPNOSIS, COMBO_STARTER_DARK_VOID, COMBO_STARTER_GRASS_WHISTLE, COMBO_STARTER_SLEEP_POWDER},
.battleAnimScript = gBattleAnimMove_Nightmare, .battleAnimScript = gBattleAnimMove_Nightmare,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -4815,7 +4815,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS : CONTEST_EFFECT_BETTER_WHEN_LATER, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS : CONTEST_EFFECT_BETTER_WHEN_LATER,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_CURSE}, .contestComboMoves = {COMBO_STARTER_CURSE, COMBO_STARTER_ENCORE, COMBO_STARTER_TAUNT, COMBO_STARTER_TORMENT},
.battleAnimScript = gBattleAnimMove_Spite, .battleAnimScript = gBattleAnimMove_Spite,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -5097,7 +5097,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.skyBattleBanned = TRUE, .skyBattleBanned = TRUE,
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_SPIKES,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Spikes, .battleAnimScript = gBattleAnimMove_Spikes,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -5179,7 +5179,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, //C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_QUICKLY_GROW_BORED : .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, //C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_QUICKLY_GROW_BORED :
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE, COMBO_STARTER_MEAN_LOOK}, .contestComboMoves = {COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE, COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_ENCORE, COMBO_STARTER_TAUNT, COMBO_STARTER_TORMENT},
.battleAnimScript = gBattleAnimMove_DestinyBond, .battleAnimScript = gBattleAnimMove_DestinyBond,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -5206,7 +5206,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, //C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_QUICKLY_GROW_BORED : .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, //C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_QUICKLY_GROW_BORED :
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING}, .contestComboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING, COMBO_STARTER_BLOCK},
.battleAnimScript = gBattleAnimMove_PerishSong, .battleAnimScript = gBattleAnimMove_PerishSong,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -5772,7 +5772,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING, .contestEffect = CONTEST_EFFECT_REPETITION_NOT_BORING,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_CELEBRATE, COMBO_STARTER_COVET, COMBO_STARTER_HAPPY_HOUR, COMBO_STARTER_WISH},
.battleAnimScript = gBattleAnimMove_Present, .battleAnimScript = gBattleAnimMove_Present,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -5997,7 +5997,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION : CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION : CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_AGILITY, COMBO_STARTER_AMNESIA, COMBO_STARTER_HONE_CLAWS, COMBO_STARTER_CALM_MIND, COMBO_STARTER_NASTY_PLOT, COMBO_STARTER_ROCK_POLISH},
.battleAnimScript = gBattleAnimMove_BatonPass, .battleAnimScript = gBattleAnimMove_BatonPass,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -6022,7 +6022,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.ignoresSubstitute = TRUE, .ignoresSubstitute = TRUE,
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_ENCORE,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Encore, .battleAnimScript = gBattleAnimMove_Encore,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -6190,7 +6190,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_LAST : CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_LAST : CONTEST_EFFECT_NEXT_APPEAL_LATER,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_FAKE_OUT}, .contestComboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_ENTRAINMENT, COMBO_STARTER_PLAY_NICE},
.battleAnimScript = gBattleAnimMove_VitalThrow, .battleAnimScript = gBattleAnimMove_VitalThrow,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -6461,7 +6461,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_LAST : CONTEST_EFFECT_AVOID_STARTLE_ONCE, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_LAST : CONTEST_EFFECT_AVOID_STARTLE_ONCE,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_TAUNT}, .contestComboMoves = {COMBO_STARTER_TAUNT, COMBO_STARTER_ENCORE, COMBO_STARTER_TORMENT},
.battleAnimScript = gBattleAnimMove_MirrorCoat, .battleAnimScript = gBattleAnimMove_MirrorCoat,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -6891,7 +6891,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5,
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_TORMENT,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Torment, .battleAnimScript = gBattleAnimMove_Torment,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -6940,7 +6940,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION : CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION : CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_WILL_O_WISP,
.contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY},
.battleAnimScript = gBattleAnimMove_WillOWisp, .battleAnimScript = gBattleAnimMove_WillOWisp,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -6964,7 +6964,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .contestEffect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_BLOCK},
.battleAnimScript = gBattleAnimMove_Memento, .battleAnimScript = gBattleAnimMove_Memento,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -7045,7 +7045,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL : CONTEST_EFFECT_STARTLE_PREV_MON, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL : CONTEST_EFFECT_STARTLE_PREV_MON,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_TOUGH : CONTEST_CATEGORY_SMART, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_TOUGH : CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_FORCE_PALM, COMBO_STARTER_THUNDER_WAVE, COMBO_STARTER_GLARE},
.battleAnimScript = gBattleAnimMove_SmellingSalts, .battleAnimScript = gBattleAnimMove_SmellingSalts,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -7260,7 +7260,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.mirrorMoveBanned = TRUE, .mirrorMoveBanned = TRUE,
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_LAST : CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_BETTER_IF_LAST : CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_WISH,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Wish, .battleAnimScript = gBattleAnimMove_Wish,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -7639,7 +7639,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN : CONTEST_EFFECT_BETTER_WHEN_LATER, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN : CONTEST_EFFECT_BETTER_WHEN_LATER,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_CURSE}, .contestComboMoves = {COMBO_STARTER_CURSE, COMBO_STARTER_ENCORE, COMBO_STARTER_TAUNT, COMBO_STARTER_TORMENT},
.battleAnimScript = gBattleAnimMove_Grudge, .battleAnimScript = gBattleAnimMove_Grudge,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -7930,7 +7930,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_REPETITION_NOT_BORING : CONTEST_EFFECT_HIGHLY_APPEALING, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_REPETITION_NOT_BORING : CONTEST_EFFECT_HIGHLY_APPEALING,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_COOL : CONTEST_CATEGORY_BEAUTY, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_COOL : CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_SUNNY_DAY}, .contestComboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_FOCUS_ENERGY},
.battleAnimScript = gBattleAnimMove_BlazeKick, .battleAnimScript = gBattleAnimMove_BlazeKick,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -7983,7 +7983,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_HAIL}, .contestComboMoves = {COMBO_STARTER_HAIL, COMBO_STARTER_DEFENSE_CURL},
.battleAnimScript = gBattleAnimMove_IceBall, .battleAnimScript = gBattleAnimMove_IceBall,
}, },
@ -8481,7 +8481,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.soundMove = TRUE, .soundMove = TRUE,
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_AVOID_STARTLE_ONCE : CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_AVOID_STARTLE_ONCE : CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_GRASS_WHISTLE,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_GrassWhistle, .battleAnimScript = gBattleAnimMove_GrassWhistle,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -8754,7 +8754,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING : CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestEffect = C_UPDATED_MOVE_EFFECTS >= GEN_6 ? CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING : CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_GROWTH}, .contestComboMoves = {COMBO_STARTER_GROWTH, COMBO_STARTER_ROTOTILLER},
.battleAnimScript = gBattleAnimMove_BulletSeed, .battleAnimScript = gBattleAnimMove_BulletSeed,
}, },
@ -8848,7 +8848,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_BLOCK,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Block, .battleAnimScript = gBattleAnimMove_Block,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -9037,7 +9037,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY},
.battleAnimScript = gBattleAnimMove_PoisonTail, .battleAnimScript = gBattleAnimMove_PoisonTail,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
}, },
@ -9063,7 +9063,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.assistBanned = TRUE, .assistBanned = TRUE,
.contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_COVET,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Covet, .battleAnimScript = gBattleAnimMove_Covet,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -9099,7 +9099,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
#endif #endif
.contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, .contestEffect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_CHARGE,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_VoltTackle, .battleAnimScript = gBattleAnimMove_VoltTackle,
.validApprenticeMove = TRUE, .validApprenticeMove = TRUE,
@ -9450,7 +9450,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_TOUGH : CONTEST_CATEGORY_SMART, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_TOUGH : CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_LOVELY_KISS, COMBO_STARTER_SPORE, COMBO_STARTER_ENTRAINMENT, COMBO_STARTER_PLAY_NICE, COMBO_STARTER_SING, COMBO_STARTER_YAWN, COMBO_STARTER_HYPNOSIS, COMBO_STARTER_DARK_VOID, COMBO_STARTER_GRASS_WHISTLE, COMBO_STARTER_SLEEP_POWDER},
.battleAnimScript = gBattleAnimMove_WakeUpSlap, .battleAnimScript = gBattleAnimMove_WakeUpSlap,
}, },
@ -9692,7 +9692,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_COOL : CONTEST_CATEGORY_BEAUTY, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_COOL : CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_METAL_SOUND}, .contestComboMoves = {COMBO_STARTER_METAL_SOUND, COMBO_STARTER_ENCORE, COMBO_STARTER_TAUNT, COMBO_STARTER_TORMENT},
.battleAnimScript = gBattleAnimMove_MetalBurst, .battleAnimScript = gBattleAnimMove_MetalBurst,
}, },
@ -9825,7 +9825,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_CUTE : CONTEST_CATEGORY_TOUGH, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_CUTE : CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_CELEBRATE, COMBO_STARTER_COVET, COMBO_STARTER_HAPPY_HOUR, COMBO_STARTER_WISH},
.battleAnimScript = gBattleAnimMove_Fling, .battleAnimScript = gBattleAnimMove_Fling,
}, },
@ -10162,7 +10162,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_SMART : CONTEST_CATEGORY_BEAUTY, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_SMART : CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = COMBO_STARTER_WORRY_SEED, .contestComboStarterId = COMBO_STARTER_WORRY_SEED,
.contestComboMoves = {COMBO_STARTER_LEECH_SEED}, .contestComboMoves = {COMBO_STARTER_LEECH_SEED, COMBO_STARTER_ROTOTILLER},
.battleAnimScript = gBattleAnimMove_WorrySeed, .battleAnimScript = gBattleAnimMove_WorrySeed,
}, },
@ -10208,7 +10208,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.skyBattleBanned = TRUE, .skyBattleBanned = TRUE,
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_TOXIC_SPIKES,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_ToxicSpikes, .battleAnimScript = gBattleAnimMove_ToxicSpikes,
}, },
@ -10336,7 +10336,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
}), }),
.contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_FORCE_PALM,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_ForcePalm, .battleAnimScript = gBattleAnimMove_ForcePalm,
}, },
@ -10384,7 +10384,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.mirrorMoveBanned = TRUE, .mirrorMoveBanned = TRUE,
.contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_ROCK_POLISH,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_RockPolish, .battleAnimScript = gBattleAnimMove_RockPolish,
}, },
@ -10461,7 +10461,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_COOL : CONTEST_CATEGORY_BEAUTY, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_COOL : CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY},
.battleAnimScript = gBattleAnimMove_NightSlash, .battleAnimScript = gBattleAnimMove_NightSlash,
}, },
@ -10505,7 +10505,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_TOUGH : CONTEST_CATEGORY_SMART, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_TOUGH : CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_ROTOTILLER},
.battleAnimScript = gBattleAnimMove_SeedBomb, .battleAnimScript = gBattleAnimMove_SeedBomb,
}, },
@ -10869,7 +10869,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.mirrorMoveBanned = TRUE, .mirrorMoveBanned = TRUE,
.contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_SMART : CONTEST_CATEGORY_CUTE, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_SMART : CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_NASTY_PLOT,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_NastyPlot, .battleAnimScript = gBattleAnimMove_NastyPlot,
}, },
@ -10957,7 +10957,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING,
.contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_COOL : CONTEST_CATEGORY_CUTE, .contestCategory = C_UPDATED_MOVE_CATEGORIES >= GEN_6 ? CONTEST_CATEGORY_COOL : CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY},
.battleAnimScript = gBattleAnimMove_ShadowClaw, .battleAnimScript = gBattleAnimMove_ShadowClaw,
}, },
@ -11541,7 +11541,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY},
.battleAnimScript = gBattleAnimMove_StoneEdge, .battleAnimScript = gBattleAnimMove_StoneEdge,
}, },
@ -11590,7 +11590,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_STEALTH_ROCK},
.battleAnimScript = gBattleAnimMove_StealthRock, .battleAnimScript = gBattleAnimMove_StealthRock,
}, },
@ -12028,7 +12028,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.sketchBanned = (B_SKETCH_BANS >= GEN_9), .sketchBanned = (B_SKETCH_BANS >= GEN_9),
.contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, .contestEffect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_DARK_VOID,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_DarkVoid, .battleAnimScript = gBattleAnimMove_DarkVoid,
}, },
@ -12134,7 +12134,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.mirrorMoveBanned = TRUE, .mirrorMoveBanned = TRUE,
.contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_HONE_CLAWS,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_HoneClaws, .battleAnimScript = gBattleAnimMove_HoneClaws,
}, },
@ -12272,7 +12272,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, .contestEffect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_TOXIC}, .contestComboMoves = {COMBO_STARTER_TOXIC, COMBO_STARTER_POISON_GAS, COMBO_STARTER_POISON_POWDER, COMBO_STARTER_TOXIC_SPIKES},
.battleAnimScript = gBattleAnimMove_Venoshock, .battleAnimScript = gBattleAnimMove_Venoshock,
}, },
@ -12395,7 +12395,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_ENTRAINMENT, COMBO_STARTER_PLAY_NICE},
.battleAnimScript = gBattleAnimMove_SmackDown, .battleAnimScript = gBattleAnimMove_SmackDown,
}, },
@ -12416,7 +12416,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_ENTRAINMENT, COMBO_STARTER_PLAY_NICE},
.battleAnimScript = gBattleAnimMove_StormThrow, .battleAnimScript = gBattleAnimMove_StormThrow,
}, },
@ -12557,7 +12557,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, //CONTEST_EFFECT_EXCITES_AUDIENCE_MORE_IF_FIRST .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, //CONTEST_EFFECT_EXCITES_AUDIENCE_MORE_IF_FIRST
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_AGILITY, COMBO_STARTER_CHARGE, COMBO_STARTER_ROCK_POLISH},
.battleAnimScript = gBattleAnimMove_ElectroBall, .battleAnimScript = gBattleAnimMove_ElectroBall,
}, },
@ -12581,7 +12581,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE},
.battleAnimScript = gBattleAnimMove_Soak, .battleAnimScript = gBattleAnimMove_Soak,
}, },
@ -12753,7 +12753,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_ENTRAINMENT,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Entrainment, .battleAnimScript = gBattleAnimMove_Entrainment,
}, },
@ -12895,7 +12895,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, .contestEffect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_AMNESIA, COMBO_STARTER_HONE_CLAWS, COMBO_STARTER_CALM_MIND, COMBO_STARTER_NASTY_PLOT},
.battleAnimScript = gBattleAnimMove_StoredPower, .battleAnimScript = gBattleAnimMove_StoredPower,
}, },
@ -13046,7 +13046,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_TOXIC}, .contestComboMoves = {COMBO_STARTER_TOXIC, COMBO_STARTER_FORCE_PALM, COMBO_STARTER_THUNDER_WAVE, COMBO_STARTER_INFERNO, COMBO_STARTER_WILL_O_WISP, COMBO_STARTER_LOVELY_KISS, COMBO_STARTER_SPORE, COMBO_STARTER_SING, COMBO_STARTER_YAWN, COMBO_STARTER_HYPNOSIS, COMBO_STARTER_DARK_VOID, COMBO_STARTER_GRASS_WHISTLE, COMBO_STARTER_SLEEP_POWDER, COMBO_STARTER_POISON_GAS, COMBO_STARTER_POISON_POWDER, COMBO_STARTER_TOXIC_SPIKES, COMBO_STARTER_GLARE},
.battleAnimScript = gBattleAnimMove_Hex, .battleAnimScript = gBattleAnimMove_Hex,
}, },
@ -13073,7 +13073,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_ENTRAINMENT, COMBO_STARTER_PLAY_NICE},
.battleAnimScript = gBattleAnimMove_SkyDrop, .battleAnimScript = gBattleAnimMove_SkyDrop,
}, },
@ -13097,7 +13097,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.mirrorMoveBanned = TRUE, .mirrorMoveBanned = TRUE,
.contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_SHIFT_GEAR,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_ShiftGear, .battleAnimScript = gBattleAnimMove_ShiftGear,
}, },
@ -13120,7 +13120,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_ENTRAINMENT, COMBO_STARTER_PLAY_NICE},
.battleAnimScript = gBattleAnimMove_CircleThrow, .battleAnimScript = gBattleAnimMove_CircleThrow,
}, },
@ -13285,7 +13285,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_CELEBRATE, COMBO_STARTER_COVET, COMBO_STARTER_HAPPY_HOUR, COMBO_STARTER_WISH},
.battleAnimScript = gBattleAnimMove_Bestow, .battleAnimScript = gBattleAnimMove_Bestow,
}, },
@ -13309,7 +13309,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
}), }),
.contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_INFERNO,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Inferno, .battleAnimScript = gBattleAnimMove_Inferno,
}, },
@ -13394,7 +13394,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.category = DAMAGE_CATEGORY_SPECIAL, .category = DAMAGE_CATEGORY_SPECIAL,
.contestEffect = CONTEST_EFFECT_AVOID_STARTLE, //CONTEST_EFFECT_QUICKLY_GROW_BORED .contestEffect = CONTEST_EFFECT_AVOID_STARTLE, //CONTEST_EFFECT_QUICKLY_GROW_BORED
.contestCategory = CONTEST_CATEGORY_COOL, .contestCategory = CONTEST_CATEGORY_COOL,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_CHARGE,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_VoltSwitch, .battleAnimScript = gBattleAnimMove_VoltSwitch,
}, },
@ -13488,7 +13488,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER, .contestEffect = CONTEST_EFFECT_NEXT_APPEAL_LATER,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = COMBO_STARTER_DRAGON_TAIL, .contestComboStarterId = COMBO_STARTER_DRAGON_TAIL,
.contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH}, .contestComboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_RUSH, COMBO_STARTER_STEALTH_ROCK, COMBO_STARTER_SPIKES, COMBO_STARTER_TOXIC_SPIKES},
.battleAnimScript = gBattleAnimMove_DragonTail, .battleAnimScript = gBattleAnimMove_DragonTail,
}, },
@ -13538,7 +13538,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_STRING_SHOT},
.battleAnimScript = gBattleAnimMove_Electroweb, .battleAnimScript = gBattleAnimMove_Electroweb,
}, },
@ -13584,7 +13584,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, .contestEffect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_FOCUS_ENERGY},
.battleAnimScript = gBattleAnimMove_DrillRun, .battleAnimScript = gBattleAnimMove_DrillRun,
}, },
@ -13897,7 +13897,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, .contestEffect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_RAIN_DANCE},
.battleAnimScript = gBattleAnimMove_Hurricane, .battleAnimScript = gBattleAnimMove_Hurricane,
}, },
@ -13944,7 +13944,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING, .contestEffect = CONTEST_EFFECT_HIGHLY_APPEALING,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_SHIFT_GEAR},
.battleAnimScript = gBattleAnimMove_GearGrind, .battleAnimScript = gBattleAnimMove_GearGrind,
}, },
@ -14068,7 +14068,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, .contestEffect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_HAIL},
.battleAnimScript = gBattleAnimMove_Glaciate, .battleAnimScript = gBattleAnimMove_Glaciate,
}, },
@ -14257,7 +14257,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_BETTER_IF_LAST, .contestEffect = CONTEST_EFFECT_BETTER_IF_LAST,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_HAIL},
.battleAnimScript = gBattleAnimMove_IcicleCrash, .battleAnimScript = gBattleAnimMove_IcicleCrash,
}, },
@ -14438,7 +14438,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.skyBattleBanned = TRUE, .skyBattleBanned = TRUE,
.contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, .contestEffect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_ROTOTILLER,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Rototiller, .battleAnimScript = gBattleAnimMove_Rototiller,
}, },
@ -14465,7 +14465,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, .contestEffect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION,
.contestCategory = CONTEST_CATEGORY_TOUGH, .contestCategory = CONTEST_CATEGORY_TOUGH,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_STRING_SHOT},
.battleAnimScript = gBattleAnimMove_StickyWeb, .battleAnimScript = gBattleAnimMove_StickyWeb,
}, },
@ -14611,8 +14611,8 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.healingMove = B_HEAL_BLOCKING >= GEN_6, .healingMove = B_HEAL_BLOCKING >= GEN_6,
.contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, .contestEffect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_PARABOLIC_CHARGE,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_CHARGE},
.battleAnimScript = gBattleAnimMove_ParabolicCharge, .battleAnimScript = gBattleAnimMove_ParabolicCharge,
}, },
@ -14903,7 +14903,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_PARABOLIC_CHARGE},
.battleAnimScript = gBattleAnimMove_Electrify, .battleAnimScript = gBattleAnimMove_Electrify,
}, },
@ -15076,7 +15076,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.magicCoatAffected = TRUE, .magicCoatAffected = TRUE,
.contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .contestEffect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_PLAY_NICE,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_PlayNice, .battleAnimScript = gBattleAnimMove_PlayNice,
}, },
@ -15327,7 +15327,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, .contestEffect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {COMBO_STARTER_TOXIC}, .contestComboMoves = {COMBO_STARTER_TOXIC, COMBO_STARTER_POISON_GAS, COMBO_STARTER_POISON_POWDER, COMBO_STARTER_TOXIC_SPIKES},
.battleAnimScript = gBattleAnimMove_VenomDrench, .battleAnimScript = gBattleAnimMove_VenomDrench,
}, },
@ -15426,7 +15426,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.mirrorMoveBanned = TRUE, .mirrorMoveBanned = TRUE,
.contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_HAPPY_HOUR,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_HappyHour, .battleAnimScript = gBattleAnimMove_HappyHour,
}, },
@ -15502,7 +15502,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.assistBanned = TRUE, .assistBanned = TRUE,
.contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, .contestEffect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = COMBO_STARTER_CELEBRATE,
.contestComboMoves = {0}, .contestComboMoves = {0},
.battleAnimScript = gBattleAnimMove_Celebrate, .battleAnimScript = gBattleAnimMove_Celebrate,
}, },
@ -15582,7 +15582,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, .contestEffect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.contestComboStarterId = 0, .contestComboStarterId = 0,
.contestComboMoves = {0}, .contestComboMoves = {COMBO_STARTER_CHARGE},
.battleAnimScript = gBattleAnimMove_Nuzzle, .battleAnimScript = gBattleAnimMove_Nuzzle,
}, },