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_UNKNOWN 8
#define COMBO_STARTER_POUND 1
#define COMBO_STARTER_FIRE_PUNCH 2
#define COMBO_STARTER_ICE_PUNCH 3
#define COMBO_STARTER_THUNDER_PUNCH 4
#define COMBO_STARTER_SCRATCH 5
#define COMBO_STARTER_VICE_GRIP 6
#define COMBO_STARTER_SWORDS_DANCE 7
#define COMBO_STARTER_SAND_ATTACK 8
#define COMBO_STARTER_HORN_ATTACK 9
#define COMBO_STARTER_LEER 10
#define COMBO_STARTER_SING 11
#define COMBO_STARTER_SURF 12
#define COMBO_STARTER_PECK 13
#define COMBO_STARTER_LEECH_SEED 14
#define COMBO_STARTER_GROWTH 15
#define COMBO_STARTER_STRING_SHOT 16
#define COMBO_STARTER_DRAGON_RAGE 17
#define COMBO_STARTER_ROCK_THROW 18
#define COMBO_STARTER_EARTHQUAKE 19
#define COMBO_STARTER_TOXIC 20
#define COMBO_STARTER_CONFUSION 21
#define COMBO_STARTER_PSYCHIC 22
#define COMBO_STARTER_HYPNOSIS 23
#define COMBO_STARTER_RAGE 24
#define COMBO_STARTER_DOUBLE_TEAM 25
#define COMBO_STARTER_HARDEN 26
#define COMBO_STARTER_DEFENSE_CURL 27
#define COMBO_STARTER_FOCUS_ENERGY 28
#define COMBO_STARTER_SMOG 29
#define COMBO_STARTER_SLUDGE 30
#define COMBO_STARTER_BONE_CLUB 31
#define COMBO_STARTER_KINESIS 32
#define COMBO_STARTER_SOFT_BOILED 33
#define COMBO_STARTER_BONEMERANG 34
#define COMBO_STARTER_REST 35
#define COMBO_STARTER_MIND_READER 36
#define COMBO_STARTER_CURSE 37
#define COMBO_STARTER_POWDER_SNOW 38
#define COMBO_STARTER_SCARY_FACE 39
#define COMBO_STARTER_BELLY_DRUM 40
#define COMBO_STARTER_SLUDGE_BOMB 41
#define COMBO_STARTER_MUD_SLAP 42
#define COMBO_STARTER_BONE_RUSH 43
#define COMBO_STARTER_LOCK_ON 44
#define COMBO_STARTER_SANDSTORM 45
#define COMBO_STARTER_ENDURE 46
#define COMBO_STARTER_CHARM 47
#define COMBO_STARTER_MEAN_LOOK 48
#define COMBO_STARTER_HEAL_BELL 49
#define COMBO_STARTER_DRAGON_BREATH 50
#define COMBO_STARTER_SWEET_SCENT 51
#define COMBO_STARTER_RAIN_DANCE 52
#define COMBO_STARTER_SUNNY_DAY 53
#define COMBO_STARTER_FAKE_OUT 54
#define COMBO_STARTER_STOCKPILE 55
#define COMBO_STARTER_HAIL 56
#define COMBO_STARTER_CHARGE 57
#define COMBO_STARTER_TAUNT 58
#define COMBO_STARTER_REVENGE 59
#define COMBO_STARTER_YAWN 60
#define COMBO_STARTER_DIVE 61
#define COMBO_STARTER_MUD_SPORT 62
#define COMBO_STARTER_METAL_SOUND 63
#define COMBO_STARTER_WATER_SPORT 64
#define COMBO_STARTER_CALM_MIND 65
#define COMBO_STARTER_DRAGON_DANCE 66
#define COMBO_STARTER_PAYBACK 67
#define COMBO_STARTER_LUCKY_CHANT 68
#define COMBO_STARTER_WORRY_SEED 69
#define COMBO_STARTER_DRAGON_RUSH 70
#define COMBO_STARTER_BRAVE_BIRD 71
#define COMBO_STARTER_THUNDER_FANG 72
#define COMBO_STARTER_ICE_FANG 73
#define COMBO_STARTER_FIRE_FANG 74
#define COMBO_STARTER_ATTACK_ORDER 75
#define COMBO_STARTER_DEFEND_ORDER 76
#define COMBO_STARTER_HEAL_ORDER 77
#define COMBO_STARTER_SCALD 78
#define COMBO_STARTER_DRAGON_TAIL 79
#define COMBO_STARTER_HYPERSPACE_HOLE 80
#define COMBO_STARTER_THOUSAND_ARROWS 81
#define COMBO_STARTER_THOUSAND_WAVES 82
#define COMBO_STARTER_HYPERSPACE_FURY 83
#define COMBO_STARTER_SHADOW_BONE 84
#define COMBO_STARTER_ELECTRIC_TERRAIN 85
#define COMBO_STARTER_MISTY_TERRAIN 86
#define COMBO_STARTER_GRASSY_TERRAIN 87
#define COMBO_STARTER_PSYCHIC_TERRAIN 88
enum {
COMBO_STARTER_POUND,
COMBO_STARTER_FIRE_PUNCH,
COMBO_STARTER_ICE_PUNCH,
COMBO_STARTER_THUNDER_PUNCH,
COMBO_STARTER_SCRATCH,
COMBO_STARTER_VICE_GRIP,
COMBO_STARTER_SWORDS_DANCE,
COMBO_STARTER_SAND_ATTACK,
COMBO_STARTER_HORN_ATTACK,
COMBO_STARTER_LEER,
COMBO_STARTER_SING,
COMBO_STARTER_SURF,
COMBO_STARTER_PECK,
COMBO_STARTER_LEECH_SEED,
COMBO_STARTER_GROWTH,
COMBO_STARTER_STRING_SHOT,
COMBO_STARTER_DRAGON_RAGE,
COMBO_STARTER_ROCK_THROW,
COMBO_STARTER_EARTHQUAKE,
COMBO_STARTER_TOXIC,
COMBO_STARTER_CONFUSION,
COMBO_STARTER_PSYCHIC,
COMBO_STARTER_HYPNOSIS,
COMBO_STARTER_RAGE,
COMBO_STARTER_DOUBLE_TEAM,
COMBO_STARTER_HARDEN,
COMBO_STARTER_DEFENSE_CURL,
COMBO_STARTER_FOCUS_ENERGY,
COMBO_STARTER_SMOG,
COMBO_STARTER_SLUDGE,
COMBO_STARTER_BONE_CLUB,
COMBO_STARTER_KINESIS,
COMBO_STARTER_SOFT_BOILED,
COMBO_STARTER_BONEMERANG,
COMBO_STARTER_REST,
COMBO_STARTER_MIND_READER,
COMBO_STARTER_CURSE,
COMBO_STARTER_POWDER_SNOW,
COMBO_STARTER_SCARY_FACE,
COMBO_STARTER_BELLY_DRUM,
COMBO_STARTER_SLUDGE_BOMB,
COMBO_STARTER_MUD_SLAP,
COMBO_STARTER_BONE_RUSH,
COMBO_STARTER_LOCK_ON,
COMBO_STARTER_SANDSTORM,
COMBO_STARTER_ENDURE,
COMBO_STARTER_CHARM,
COMBO_STARTER_MEAN_LOOK,
COMBO_STARTER_HEAL_BELL,
COMBO_STARTER_DRAGON_BREATH,
COMBO_STARTER_SWEET_SCENT,
COMBO_STARTER_RAIN_DANCE,
COMBO_STARTER_SUNNY_DAY,
COMBO_STARTER_FAKE_OUT,
COMBO_STARTER_STOCKPILE,
COMBO_STARTER_HAIL,
COMBO_STARTER_CHARGE,
COMBO_STARTER_TAUNT,
COMBO_STARTER_REVENGE,
COMBO_STARTER_YAWN,
COMBO_STARTER_DIVE,
COMBO_STARTER_MUD_SPORT,
COMBO_STARTER_METAL_SOUND,
COMBO_STARTER_WATER_SPORT,
COMBO_STARTER_CALM_MIND,
COMBO_STARTER_DRAGON_DANCE,
COMBO_STARTER_PAYBACK,
COMBO_STARTER_LUCKY_CHANT,
COMBO_STARTER_WORRY_SEED,
COMBO_STARTER_DRAGON_RUSH,
COMBO_STARTER_BRAVE_BIRD,
COMBO_STARTER_THUNDER_FANG,
COMBO_STARTER_ICE_FANG,
COMBO_STARTER_FIRE_FANG,
COMBO_STARTER_ATTACK_ORDER,
COMBO_STARTER_DEFEND_ORDER,
COMBO_STARTER_HEAL_ORDER,
COMBO_STARTER_SCALD,
COMBO_STARTER_DRAGON_TAIL,
COMBO_STARTER_HYPERSPACE_HOLE,
COMBO_STARTER_THOUSAND_ARROWS,
COMBO_STARTER_THOUSAND_WAVES,
COMBO_STARTER_HYPERSPACE_FURY,
COMBO_STARTER_SHADOW_BONE,
COMBO_STARTER_ELECTRIC_TERRAIN,
COMBO_STARTER_MISTY_TERRAIN,
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

2
include/contest_effect.h
View File

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