tbld/tumbledemerald-legacy
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 5 Wiki Activity

Fairy type

Browse Source
This commit is contained in:
Skye Chappelle
2022-10-11 17:43:31 +00:00
parent 5b4b9a390b
commit 4b02cad24b
10 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/battle_moves.h
View File

@ -2422,7 +2422,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
{
.effect = EFFECT_CONFUSE,
.power = 0,
.type = TYPE_NORMAL,
.type = TYPE_FAIRY,
.accuracy = 75,
.pp = 10,
.secondaryEffectChance = 0,
@ -2656,7 +2656,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
{
.effect = EFFECT_ATTACK_DOWN_2,
.power = 0,
.type = TYPE_NORMAL,
.type = TYPE_FAIRY,
.accuracy = 100,
.pp = 20,
.secondaryEffectChance = 0,
@ -3072,7 +3072,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
{
.effect = EFFECT_MOONLIGHT,
.power = 0,
.type = TYPE_NORMAL,
.type = TYPE_FAIRY,
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,

48
src/data/pokemon/base_stats.h
View File

@ -1134,8 +1134,8 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 35,
.baseSpAttack = 60,
.baseSpDefense = 65,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FAIRY,
.catchRate = 150,
.expYield = 68,
.evYield_HP = 2,
@ -1166,8 +1166,8 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 60,
.baseSpAttack = 85,
.baseSpDefense = 90,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FAIRY,
.catchRate = 25,
.expYield = 129,
.evYield_HP = 3,
@ -1263,7 +1263,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 45,
.baseSpDefense = 25,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type2 = TYPE_FAIRY,
.catchRate = 170,
.expYield = 76,
.evYield_HP = 2,
@ -1295,7 +1295,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 75,
.baseSpDefense = 50,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type2 = TYPE_FAIRY,
.catchRate = 50,
.expYield = 109,
.evYield_HP = 3,
@ -3919,7 +3919,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 100,
.baseSpDefense = 120,
.type1 = TYPE_PSYCHIC,
.type2 = TYPE_PSYCHIC,
.type2 = TYPE_FAIRY,
.catchRate = 45,
.expYield = 136,
.evYield_HP = 0,
@ -5550,8 +5550,8 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 15,
.baseSpAttack = 45,
.baseSpDefense = 55,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FAIRY,
.catchRate = 150,
.expYield = 37,
.evYield_HP = 0,
@ -5583,7 +5583,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 40,
.baseSpDefense = 20,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type2 = TYPE_FAIRY,
.catchRate = 170,
.expYield = 39,
.evYield_HP = 1,
@ -5614,8 +5614,8 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 20,
.baseSpAttack = 40,
.baseSpDefense = 65,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FAIRY,
.catchRate = 190,
.expYield = 74,
.evYield_HP = 0,
@ -5646,7 +5646,7 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 40,
.baseSpAttack = 80,
.baseSpDefense = 105,
.type1 = TYPE_NORMAL,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FLYING,
.catchRate = 75,
.expYield = 114,
@ -5871,7 +5871,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 20,
.baseSpDefense = 50,
.type1 = TYPE_WATER,
.type2 = TYPE_WATER,
.type2 = TYPE_FAIRY,
.catchRate = 190,
.expYield = 58,
.evYield_HP = 2,
@ -5903,7 +5903,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 50,
.baseSpDefense = 80,
.type1 = TYPE_WATER,
.type2 = TYPE_WATER,
.type2 = TYPE_FAIRY,
.catchRate = 75,
.expYield = 153,
.evYield_HP = 3,
@ -6702,8 +6702,8 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 30,
.baseSpAttack = 40,
.baseSpDefense = 40,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FAIRY,
.catchRate = 190,
.expYield = 63,
.evYield_HP = 0,
@ -6734,8 +6734,8 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 45,
.baseSpAttack = 60,
.baseSpDefense = 60,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FAIRY,
.catchRate = 75,
.expYield = 178,
.evYield_HP = 0,
@ -10465,7 +10465,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 20,
.baseSpDefense = 40,
.type1 = TYPE_NORMAL,
.type2 = TYPE_NORMAL,
.type2 = TYPE_FAIRY,
.catchRate = 150,
.expYield = 33,
.evYield_HP = 1,
@ -10625,7 +10625,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 55,
.baseSpDefense = 55,
.type1 = TYPE_STEEL,
.type2 = TYPE_STEEL,
.type2 = TYPE_FAIRY,
.catchRate = 45,
.expYield = 98,
.evYield_HP = 0,
@ -11809,7 +11809,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 45,
.baseSpDefense = 35,
.type1 = TYPE_PSYCHIC,
.type2 = TYPE_PSYCHIC,
.type2 = TYPE_FAIRY,
.catchRate = 235,
.expYield = 70,
.evYield_HP = 0,
@ -11841,7 +11841,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 65,
.baseSpDefense = 55,
.type1 = TYPE_PSYCHIC,
.type2 = TYPE_PSYCHIC,
.type2 = TYPE_FAIRY,
.catchRate = 120,
.expYield = 140,
.evYield_HP = 0,
@ -11873,7 +11873,7 @@ const struct BaseStats gBaseStats[] =
.baseSpAttack = 125,
.baseSpDefense = 115,
.type1 = TYPE_PSYCHIC,
.type2 = TYPE_PSYCHIC,
.type2 = TYPE_FAIRY,
.catchRate = 45,
.expYield = 208,
.evYield_HP = 0,