mirror of
https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git
synced 2026-09-07 09:35:37 -05:00
Update Various Base Stats
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 358 B After Width: | Height: | Size: 363 B |
@@ -11,18 +11,9 @@
|
||||
|
||||
@@Fix Num Evolutions@@
|
||||
.org 0x4598A, 0xFF
|
||||
.byte EVOS_PER_MON * 8
|
||||
|
||||
.org 0x4598E, 0xFF
|
||||
.byte EVOS_PER_MON * 8
|
||||
|
||||
@@Fix Breeding@@
|
||||
.org 0x459CC, 0xFF
|
||||
ldr r0, .BreedingNumSpecies
|
||||
add r0, #0x1
|
||||
|
||||
.org 0x459EC, 0xFF
|
||||
.BreedingNumSpecies: .word NUM_SPECIES - 1
|
||||
mov r5, #EVOS_PER_MON * 8
|
||||
mov r3, r12
|
||||
add r3, #EVOS_PER_MON * 8
|
||||
|
||||
@@Fix Egg Hatching Time@@
|
||||
.org 0x46204, 0xFF
|
||||
|
||||
198
src/Base_Stats.c
198
src/Base_Stats.c
@@ -5971,7 +5971,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(75),
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.eggCycles = 20,
|
||||
.friendship = 70,
|
||||
.growthRate = GROWTH_MEDIUM_SLOW,
|
||||
@@ -21355,8 +21355,8 @@ const struct BaseStats gBaseStats[] =
|
||||
.growthRate = GROWTH_MEDIUM_SLOW,
|
||||
.eggGroup1 = EGG_GROUP_FIELD,
|
||||
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
|
||||
.ability1 = ABILITY_STORMDRAIN,
|
||||
.ability2 = ABILITY_STORMDRAIN,
|
||||
.ability1 = ABILITY_INNERFOCUS,
|
||||
.ability2 = ABILITY_REGENERATOR,
|
||||
.safariZoneFleeRate = 0,
|
||||
.hiddenAbility = ABILITY_RECKLESS,
|
||||
.noFlip = TRUE,
|
||||
@@ -22453,32 +22453,32 @@ const struct BaseStats gBaseStats[] =
|
||||
|
||||
[SPECIES_SHADOW_WARRIOR] =
|
||||
{
|
||||
.baseHP = 120,
|
||||
.baseAttack = 70,
|
||||
.baseDefense = 120,
|
||||
.baseSpAttack = 75,
|
||||
.baseSpDefense = 130,
|
||||
.baseSpeed = 85,
|
||||
.type1 = TYPE_PSYCHIC,
|
||||
.type2 = TYPE_PSYCHIC,
|
||||
.catchRate = 3,
|
||||
.expYield = 210,
|
||||
.baseHP = 60,
|
||||
.baseAttack = 115,
|
||||
.baseDefense = 65,
|
||||
.baseSpAttack = 80,
|
||||
.baseSpDefense = 65,
|
||||
.baseSpeed = 115,
|
||||
.type1 = TYPE_GHOST,
|
||||
.type2 = TYPE_DARK,
|
||||
.catchRate = 0,
|
||||
.expYield = 165,
|
||||
.evYield_HP = 0,
|
||||
.evYield_Attack = 0,
|
||||
.evYield_Attack = 2,
|
||||
.evYield_Defense = 0,
|
||||
.evYield_SpAttack = 0,
|
||||
.evYield_SpDefense = 3,
|
||||
.evYield_Speed = 0,
|
||||
.evYield_SpDefense = 0,
|
||||
.evYield_Speed = 1,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(100),
|
||||
.eggCycles = 210,
|
||||
.friendship = 100,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
|
||||
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
|
||||
.ability1 = ABILITY_LEVITATE,
|
||||
.ability2 = ABILITY_LEVITATE,
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 20,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_MEDIUM_FAST,
|
||||
.eggGroup1 = EGG_GROUP_FIELD,
|
||||
.eggGroup2 = EGG_GROUP_FIELD,
|
||||
.ability1 = ABILITY_TOUGHCLAWS,
|
||||
.ability2 = ABILITY_NONE,
|
||||
.safariZoneFleeRate = 0,
|
||||
.hiddenAbility = ABILITY_NONE,
|
||||
.noFlip = TRUE,
|
||||
@@ -26437,7 +26437,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.growthRate = GROWTH_SLOW,
|
||||
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
|
||||
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
|
||||
.ability1 = ABILITY_POWERCONSTRUCT,
|
||||
.ability1 = ABILITY_AURABREAK,
|
||||
.ability2 = ABILITY_NONE,
|
||||
.safariZoneFleeRate = 0,
|
||||
.hiddenAbility = ABILITY_POWERCONSTRUCT,
|
||||
@@ -26539,7 +26539,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.ability1 = ABILITY_MAGICIAN,
|
||||
.ability2 = ABILITY_NONE,
|
||||
.safariZoneFleeRate = 0,
|
||||
.hiddenAbility = ABILITY_NONE,
|
||||
.hiddenAbility = ABILITY_PORTALPOWER,
|
||||
.noFlip = TRUE,
|
||||
},
|
||||
|
||||
@@ -27799,34 +27799,34 @@ const struct BaseStats gBaseStats[] =
|
||||
|
||||
[SPECIES_VIVILLON_FANCY] =
|
||||
{
|
||||
.baseHP = 60,
|
||||
.baseAttack = 115,
|
||||
.baseDefense = 65,
|
||||
.baseSpAttack = 80,
|
||||
.baseSpDefense = 65,
|
||||
.baseSpeed = 115,
|
||||
.type1 = TYPE_GHOST,
|
||||
.type2 = TYPE_DARK,
|
||||
.catchRate = 0,
|
||||
.expYield = 165,
|
||||
.evYield_HP = 0,
|
||||
.evYield_Attack = 2,
|
||||
.baseHP = 80,
|
||||
.baseAttack = 52,
|
||||
.baseDefense = 50,
|
||||
.baseSpAttack = 90,
|
||||
.baseSpDefense = 50,
|
||||
.baseSpeed = 89,
|
||||
.type1 = TYPE_BUG,
|
||||
.type2 = TYPE_FLYING,
|
||||
.catchRate = 45,
|
||||
.expYield = 185,
|
||||
.evYield_HP = 1,
|
||||
.evYield_Attack = 0,
|
||||
.evYield_Defense = 0,
|
||||
.evYield_SpAttack = 0,
|
||||
.evYield_SpAttack = 1,
|
||||
.evYield_SpDefense = 0,
|
||||
.evYield_Speed = 1,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 20,
|
||||
.friendship = 0,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.eggCycles = 16,
|
||||
.friendship = 70,
|
||||
.growthRate = GROWTH_MEDIUM_FAST,
|
||||
.eggGroup1 = EGG_GROUP_FIELD,
|
||||
.eggGroup2 = EGG_GROUP_FIELD,
|
||||
.ability1 = ABILITY_TOUGHCLAWS,
|
||||
.ability2 = ABILITY_NONE,
|
||||
.eggGroup1 = EGG_GROUP_BUG,
|
||||
.eggGroup2 = EGG_GROUP_BUG,
|
||||
.ability1 = ABILITY_SHIELDDUST,
|
||||
.ability2 = ABILITY_COMPOUNDEYES,
|
||||
.safariZoneFleeRate = 0,
|
||||
.hiddenAbility = ABILITY_NONE,
|
||||
.hiddenAbility = ABILITY_FRIENDGUARD,
|
||||
.noFlip = TRUE,
|
||||
},
|
||||
|
||||
@@ -29269,7 +29269,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(11),
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.eggCycles = 20,
|
||||
.friendship = 70,
|
||||
.growthRate = GROWTH_MEDIUM_FAST,
|
||||
@@ -29482,68 +29482,10 @@ const struct BaseStats gBaseStats[] =
|
||||
|
||||
[SPECIES_DIALGA_PRIMAL] =
|
||||
{
|
||||
.baseHP = 170,
|
||||
.baseAttack = 170,
|
||||
.baseDefense = 170,
|
||||
.baseSpAttack = 170,
|
||||
.baseSpDefense = 170,
|
||||
.baseSpeed = 170,
|
||||
.type1 = TYPE_NORMAL,
|
||||
.type2 = TYPE_NORMAL,
|
||||
.catchRate = 170,
|
||||
.expYield = 170,
|
||||
.evYield_HP = 2,
|
||||
.evYield_Attack = 2,
|
||||
.evYield_Defense = 2,
|
||||
.evYield_SpAttack = 2,
|
||||
.evYield_SpDefense = 2,
|
||||
.evYield_Speed = 2,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(67),
|
||||
.eggCycles = 170,
|
||||
.friendship = 170,
|
||||
.growthRate = GROWTH_MEDIUM_FAST,
|
||||
.eggGroup1 = EGG_GROUP_WATER_1,
|
||||
.eggGroup2 = EGG_GROUP_WATER_1,
|
||||
.ability1 = ABILITY_NONE,
|
||||
.ability2 = ABILITY_NONE,
|
||||
.safariZoneFleeRate = 170,
|
||||
.hiddenAbility = ABILITY_NONE,
|
||||
.noFlip = TRUE,
|
||||
},
|
||||
|
||||
[SPECIES_PALKIA_PRIMAL] =
|
||||
{
|
||||
.baseHP = 170,
|
||||
.baseAttack = 170,
|
||||
.baseDefense = 170,
|
||||
.baseSpAttack = 170,
|
||||
.baseSpDefense = 170,
|
||||
.baseSpeed = 170,
|
||||
.type1 = TYPE_NORMAL,
|
||||
.type2 = TYPE_NORMAL,
|
||||
.catchRate = 170,
|
||||
.expYield = 170,
|
||||
.evYield_HP = 2,
|
||||
.evYield_Attack = 2,
|
||||
.evYield_Defense = 2,
|
||||
.evYield_SpAttack = 2,
|
||||
.evYield_SpDefense = 2,
|
||||
.evYield_Speed = 2,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(67),
|
||||
.eggCycles = 170,
|
||||
.friendship = 170,
|
||||
.growthRate = GROWTH_MEDIUM_FAST,
|
||||
.eggGroup1 = EGG_GROUP_WATER_1,
|
||||
.eggGroup2 = EGG_GROUP_WATER_1,
|
||||
.ability1 = ABILITY_NONE,
|
||||
.ability2 = ABILITY_NONE,
|
||||
.safariZoneFleeRate = 170,
|
||||
.hiddenAbility = ABILITY_NONE,
|
||||
.noFlip = TRUE,
|
||||
},
|
||||
|
||||
[SPECIES_VIVILLON_ARCHIPELAGO] =
|
||||
@@ -31810,7 +31752,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -31843,7 +31785,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -32800,7 +32742,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 1,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(0),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -33757,7 +33699,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -33790,7 +33732,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -33823,7 +33765,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -33856,7 +33798,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -33889,7 +33831,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -33922,7 +33864,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -33955,7 +33897,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -33988,7 +33930,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34021,7 +33963,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34054,7 +33996,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34087,7 +34029,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34120,7 +34062,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34153,7 +34095,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34186,7 +34128,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34219,7 +34161,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34252,7 +34194,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34285,7 +34227,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_NONE,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.genderRatio = MON_GENDERLESS,
|
||||
.eggCycles = 120,
|
||||
.friendship = 0,
|
||||
.growthRate = GROWTH_SLOW,
|
||||
@@ -34760,7 +34702,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.noFlip = TRUE,
|
||||
},
|
||||
|
||||
[SPECIES_NECROZMA_MANE] =
|
||||
[SPECIES_NECROZMA_DUSK_MANE] =
|
||||
{
|
||||
.baseHP = 97,
|
||||
.baseAttack = 157,
|
||||
@@ -34793,7 +34735,7 @@ const struct BaseStats gBaseStats[] =
|
||||
.noFlip = TRUE,
|
||||
},
|
||||
|
||||
[SPECIES_NECROZMA_WINGS] =
|
||||
[SPECIES_NECROZMA_DAWN_WINGS] =
|
||||
{
|
||||
.baseHP = 97,
|
||||
.baseAttack = 113,
|
||||
|
||||
Reference in New Issue
Block a user