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

Merge pull request #40 from Kurausukun/battle_engine_v2

Browse Source 
change pokemon types to use fairy type
This commit is contained in:
DizzyEggg 2018-11-25 11:10:52 +01:00 committed by GitHub
commit d68323832f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1139,8 +1139,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,
@ -1172,8 +1172,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,
@ -1272,7 +1272,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,
@ -1305,7 +1305,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,
@ -4011,7 +4011,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,
@ -5693,8 +5693,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,
@ -5759,8 +5759,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,
@ -5792,7 +5792,7 @@ const struct BaseStats gBaseStats[] =
.baseSpeed = 40,
.baseSpAttack = 80,
.baseSpDefense = 105,
.type1 = TYPE_NORMAL,
.type1 = TYPE_FAIRY,
.type2 = TYPE_FLYING,
.catchRate = 75,
.expYield = 114,
@ -6024,7 +6024,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,
@ -6057,7 +6057,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,
@ -6881,8 +6881,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,
@ -6914,8 +6914,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,
@ -11535,7 +11535,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,
@ -11700,7 +11700,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,
@ -12921,7 +12921,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,
@ -12954,7 +12954,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,
@ -12987,7 +12987,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,