ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 18:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gen 8 combo moves

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-11-01 21:59:34 -03:00
parent c4aa2a1e92
commit 8332bfae46
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/constants/contest.h
View File

@ -238,5 +238,9 @@
#define COMBO_STARTER_THOUSAND_WAVES 82 #define COMBO_STARTER_THOUSAND_WAVES 82
#define COMBO_STARTER_HYPERSPACE_FURY 83 #define COMBO_STARTER_HYPERSPACE_FURY 83
#define COMBO_STARTER_SHADOW_BONE 84 #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
#endif // GUARD_CONSTANTS_CONTEST_H #endif // GUARD_CONSTANTS_CONTEST_H

18
src/data/contest_moves.h
View File

@ -4633,7 +4633,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
{ {
.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.comboStarterId = 0, .comboStarterId = COMBO_STARTER_GRASSY_TERRAIN,
.comboMoves = {0} .comboMoves = {0}
}, },
@ -4641,7 +4641,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
{ {
.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.comboStarterId = 0, .comboStarterId = COMBO_STARTER_MISTY_TERRAIN,
.comboMoves = {0} .comboMoves = {0}
}, },
@ -4825,7 +4825,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
{ {
.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.comboStarterId = 0, .comboStarterId = COMBO_STARTER_ELECTRIC_TERRAIN,
.comboMoves = {0} .comboMoves = {0}
}, },
@ -5115,7 +5115,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
{ {
.effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.comboStarterId = 0, .comboStarterId = COMBO_STARTER_PSYCHIC_TERRAIN,
.comboMoves = {0} .comboMoves = {0}
}, },
@ -5684,7 +5684,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
.effect = CONTEST_EFFECT_STARTLE_PREV_MONS, .effect = CONTEST_EFFECT_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.comboStarterId = 0, .comboStarterId = 0,
.comboMoves = {0} .comboMoves = {COMBO_STARTER_PSYCHIC_TERRAIN}
}, },
[MOVE_VENOM_DRENCH] = [MOVE_VENOM_DRENCH] =
@ -5724,7 +5724,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
.effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.comboStarterId = 0, .comboStarterId = 0,
.comboMoves = {0} .comboMoves = {COMBO_STARTER_MISTY_TERRAIN}
}, },
[MOVE_GRASSY_GLIDE] = [MOVE_GRASSY_GLIDE] =
@ -5732,7 +5732,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
.effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER,
.contestCategory = CONTEST_CATEGORY_SMART, .contestCategory = CONTEST_CATEGORY_SMART,
.comboStarterId = 0, .comboStarterId = 0,
.comboMoves = {0} .comboMoves = {COMBO_STARTER_GRASSY_TERRAIN}
}, },
[MOVE_RISING_VOLTAGE] = [MOVE_RISING_VOLTAGE] =
@ -5740,7 +5740,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
.effect = CONTEST_EFFECT_HIGHLY_APPEALING, .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
.contestCategory = CONTEST_CATEGORY_BEAUTY, .contestCategory = CONTEST_CATEGORY_BEAUTY,
.comboStarterId = 0, .comboStarterId = 0,
.comboMoves = {0} .comboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN}
}, },
[MOVE_TERRAIN_PULSE] = [MOVE_TERRAIN_PULSE] =
@ -5748,7 +5748,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
.effect = CONTEST_EFFECT_HIGHLY_APPEALING, .effect = CONTEST_EFFECT_HIGHLY_APPEALING,
.contestCategory = CONTEST_CATEGORY_CUTE, .contestCategory = CONTEST_CATEGORY_CUTE,
.comboStarterId = 0, .comboStarterId = 0,
.comboMoves = {0}, .comboMoves = {COMBO_STARTER_ELECTRIC_TERRAIN, COMBO_STARTER_MISTY_TERRAIN, COMBO_STARTER_GRASSY_TERRAIN, COMBO_STARTER_PSYCHIC_TERRAIN},
}, },
[MOVE_SKITTER_SMACK] = [MOVE_SKITTER_SMACK] =