Moved Gen 5 data to gBaseStats
This commit is contained in:
Eduardo Quezada
parent
bb703bfd03
commit
46c99b040f
6 changed files with 2445 additions and 645 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -27,9 +27,9 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] =
|
|||
#if P_GEN_5_POKEMON == TRUE
|
||||
[SPECIES_TORNADUS_INCARNATE] = sTornadusFormChangeTable,
|
||||
[SPECIES_TORNADUS_THERIAN] = sTornadusFormChangeTable,
|
||||
[SPECIES_THUNDURUS] = sThundurusFormChangeTable,
|
||||
[SPECIES_THUNDURUS_INCARNATE] = sThundurusFormChangeTable,
|
||||
[SPECIES_THUNDURUS_THERIAN] = sThundurusFormChangeTable,
|
||||
[SPECIES_LANDORUS] = sLandorusFormChangeTable,
|
||||
[SPECIES_LANDORUS_INCARNATE] = sLandorusFormChangeTable,
|
||||
[SPECIES_LANDORUS_THERIAN] = sLandorusFormChangeTable,
|
||||
[SPECIES_KELDEO_ORDINARY] = sKeldeoFormChangeTable,
|
||||
[SPECIES_KELDEO_RESOLUTE] = sKeldeoFormChangeTable,
|
||||
|
|
|
|||
|
|
@ -11233,6 +11233,28 @@ static const struct LevelUpMove sBasculinLevelUpLearnset[] = {
|
|||
LEVEL_UP_END
|
||||
};
|
||||
|
||||
static const struct LevelUpMove sBasculinWhiteStripedLevelUpLearnset[] = {
|
||||
LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
|
||||
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
|
||||
LEVEL_UP_MOVE( 1, MOVE_WATER_GUN),
|
||||
LEVEL_UP_MOVE( 3, MOVE_UPROAR),
|
||||
LEVEL_UP_MOVE( 5, MOVE_HEADBUTT),
|
||||
LEVEL_UP_MOVE( 7, MOVE_BITE),
|
||||
LEVEL_UP_MOVE( 9, MOVE_AQUA_JET),
|
||||
LEVEL_UP_MOVE(11, MOVE_CHIP_AWAY),
|
||||
LEVEL_UP_MOVE(14, MOVE_TAKE_DOWN),
|
||||
LEVEL_UP_MOVE(17, MOVE_CRUNCH),
|
||||
LEVEL_UP_MOVE(20, MOVE_AQUA_TAIL),
|
||||
LEVEL_UP_MOVE(23, MOVE_SOAK),
|
||||
LEVEL_UP_MOVE(26, MOVE_DOUBLE_EDGE),
|
||||
LEVEL_UP_MOVE(30, MOVE_SCARY_FACE),
|
||||
LEVEL_UP_MOVE(34, MOVE_FLAIL),
|
||||
LEVEL_UP_MOVE(38, MOVE_FINAL_GAMBIT),
|
||||
LEVEL_UP_MOVE(42, MOVE_THRASH),
|
||||
LEVEL_UP_MOVE(46, MOVE_HEAD_SMASH),
|
||||
LEVEL_UP_END
|
||||
};
|
||||
|
||||
static const struct LevelUpMove sSandileLevelUpLearnset[] = {
|
||||
LEVEL_UP_MOVE( 1, MOVE_LEER),
|
||||
LEVEL_UP_MOVE( 1, MOVE_RAGE),
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
const struct PokedexEntryForms gPokedexEntriesForms[] =
|
||||
{
|
||||
#if P_GEN_5_POKEMON == TRUE
|
||||
[SPECIES_AUDINO_MEGA] =
|
||||
{
|
||||
.height = 15,
|
||||
.weight = 320,
|
||||
.description = gAudinoPokedexText, // No official dex entry for this form
|
||||
},
|
||||
#endif
|
||||
#if P_GEN_6_POKEMON == TRUE
|
||||
[SPECIES_DIANCIE_MEGA] =
|
||||
{
|
||||
|
|
@ -17,89 +9,7 @@ const struct PokedexEntryForms gPokedexEntriesForms[] =
|
|||
},
|
||||
#endif
|
||||
|
||||
#if P_GEN_5_POKEMON == TRUE
|
||||
[SPECIES_DARUMAKA_GALARIAN] =
|
||||
{
|
||||
.height = 7,
|
||||
.weight = 400,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
[SPECIES_DARMANITAN_GALARIAN] =
|
||||
{
|
||||
.categoryName = _("Zen Charm"),
|
||||
.height = 17,
|
||||
.weight = 1200,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
[SPECIES_YAMASK_GALARIAN] =
|
||||
{
|
||||
.height = 5,
|
||||
.weight = 15,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
[SPECIES_STUNFISK_GALARIAN] =
|
||||
{
|
||||
.height = 7,
|
||||
.weight = 205,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
#endif
|
||||
|
||||
#if P_GEN_5_POKEMON == TRUE
|
||||
// Basculin
|
||||
[SPECIES_BASCULIN_BLUE_STRIPED] =
|
||||
{
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
// Darmanitan
|
||||
[SPECIES_DARMANITAN_ZEN_MODE] =
|
||||
{
|
||||
.categoryName = _("Zen Charm"),
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
[SPECIES_DARMANITAN_GALARIAN_ZEN_MODE] =
|
||||
{
|
||||
.categoryName = _("Zen Charm"),
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
// Therian Forms
|
||||
[SPECIES_TORNADUS_THERIAN] =
|
||||
{
|
||||
.height = 14,
|
||||
.weight = 630,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
[SPECIES_THUNDURUS_THERIAN] =
|
||||
{
|
||||
.height = 30,
|
||||
.weight = 610,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
[SPECIES_LANDORUS_THERIAN] =
|
||||
{
|
||||
.height = 13,
|
||||
.weight = 680,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
// Kyurem
|
||||
[SPECIES_KYUREM_WHITE] =
|
||||
{
|
||||
.height = 36,
|
||||
.weight = 3250,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
[SPECIES_KYUREM_BLACK] =
|
||||
{
|
||||
.height = 33,
|
||||
.weight = 3250,
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
// Keldeo
|
||||
[SPECIES_KELDEO_RESOLUTE] =
|
||||
{
|
||||
.description = gDummyPokedexText,
|
||||
},
|
||||
#endif
|
||||
#if P_GEN_6_POKEMON == TRUE
|
||||
// Meowstic
|
||||
[SPECIES_MEOWSTIC_FEMALE] =
|
||||
|
|
|
|||
|
|
@ -1718,7 +1718,7 @@ const u16 gPokedexOrder_Weight[] =
|
|||
SPECIES_RUNERIGUS,
|
||||
SPECIES_DUGTRIO_ALOLAN,
|
||||
SPECIES_MAGMORTAR,
|
||||
SPECIES_LANDORUS,
|
||||
SPECIES_LANDORUS_INCARNATE,
|
||||
SPECIES_ARMALDO,
|
||||
SPECIES_SLIGGOO_HISUIAN,
|
||||
SPECIES_TYPHLOSION_HISUIAN,
|
||||
|
|
|
|||
|
|
@ -23165,6 +23165,35 @@ static const u16 sBasculinTeachableLearnset[] = {
|
|||
MOVE_UNAVAILABLE,
|
||||
};
|
||||
|
||||
static const u16 sBasculinWhiteStripedTeachableLearnset[] = {
|
||||
MOVE_ATTRACT,
|
||||
MOVE_CUT,
|
||||
MOVE_DIVE,
|
||||
MOVE_DOUBLE_EDGE,
|
||||
MOVE_DOUBLE_TEAM,
|
||||
MOVE_FACADE,
|
||||
MOVE_FRUSTRATION,
|
||||
MOVE_HAIL,
|
||||
MOVE_HIDDEN_POWER,
|
||||
MOVE_ICE_BEAM,
|
||||
MOVE_ICY_WIND,
|
||||
MOVE_PROTECT,
|
||||
MOVE_RAIN_DANCE,
|
||||
MOVE_REST,
|
||||
MOVE_RETURN,
|
||||
MOVE_SECRET_POWER,
|
||||
MOVE_SLEEP_TALK,
|
||||
MOVE_SNORE,
|
||||
MOVE_SUBSTITUTE,
|
||||
MOVE_SURF,
|
||||
MOVE_SWAGGER,
|
||||
MOVE_SWIFT,
|
||||
MOVE_TAUNT,
|
||||
MOVE_TOXIC,
|
||||
MOVE_WATERFALL,
|
||||
MOVE_UNAVAILABLE,
|
||||
};
|
||||
|
||||
static const u16 sSandileTeachableLearnset[] = {
|
||||
MOVE_ATTRACT,
|
||||
MOVE_COUNTER,
|
||||
|
|
|
|||
Loading…
Reference in a new issue