diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-12 11:57:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 11:57:36 -0500 |
| commit | 78925916f3fcceca714b8a9ffa8400e33470eae3 (patch) | |
| tree | 4ffec42cb771ed687c3e262f4d667fbe54d2fcb5 /src | |
| parent | 987fdf6fcd42b0c61cc3b347ebd140292e2f2a1f (diff) | |
| parent | 21ee6cb9fb1cdfbafe6018372826d731325f1de2 (diff) | |
Merge pull request #1327 from LOuroboros/vitamins
Added constant labels for EV manipulating item effects
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/pokemon/item_effects.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 1ed721e44..1d7f16b90 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -163,7 +163,7 @@ const u8 gItemEffect_SacredAsh[7] = { const u8 gItemEffect_HPUp[10] = { [4] = ITEM4_EV_HP, [5] = ITEM5_FRIENDSHIP_ALL, - [6] = 10, + [6] = ITEM6_ADD_EV, [7] = 5, [8] = 3, [9] = 2, @@ -172,7 +172,7 @@ const u8 gItemEffect_HPUp[10] = { const u8 gItemEffect_Protein[10] = { [4] = ITEM4_EV_ATK, [5] = ITEM5_FRIENDSHIP_ALL, - [6] = 10, + [6] = ITEM6_ADD_EV, [7] = 5, [8] = 3, [9] = 2, @@ -180,7 +180,7 @@ const u8 gItemEffect_Protein[10] = { const u8 gItemEffect_Iron[10] = { [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, - [6] = 10, + [6] = ITEM6_ADD_EV, [7] = 5, [8] = 3, [9] = 2, @@ -188,7 +188,7 @@ const u8 gItemEffect_Iron[10] = { const u8 gItemEffect_Carbos[10] = { [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, - [6] = 10, + [6] = ITEM6_ADD_EV, [7] = 5, [8] = 3, [9] = 2, @@ -196,7 +196,7 @@ const u8 gItemEffect_Carbos[10] = { const u8 gItemEffect_Calcium[10] = { [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, - [6] = 10, + [6] = ITEM6_ADD_EV, [7] = 5, [8] = 3, [9] = 2, @@ -222,7 +222,7 @@ const u8 gItemEffect_PPUp[9] = { const u8 gItemEffect_Zinc[10] = { [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, - [6] = 10, + [6] = ITEM6_ADD_EV, [7] = 5, [8] = 3, [9] = 2, @@ -354,7 +354,7 @@ const u8 gItemEffect_SitrusBerry[7] = { const u8 gItemEffect_PomegBerry[10] = { [4] = ITEM4_EV_HP, [5] = ITEM5_FRIENDSHIP_ALL, - [6] = -10, + [6] = ITEM6_SUBTRACT_EV, [7] = 10, [8] = 5, [9] = 2, @@ -363,7 +363,7 @@ const u8 gItemEffect_PomegBerry[10] = { const u8 gItemEffect_KelpsyBerry[10] = { [4] = ITEM4_EV_ATK, [5] = ITEM5_FRIENDSHIP_ALL, - [6] = -10, + [6] = ITEM6_SUBTRACT_EV, [7] = 10, [8] = 5, [9] = 2, @@ -371,7 +371,7 @@ const u8 gItemEffect_KelpsyBerry[10] = { const u8 gItemEffect_QualotBerry[10] = { [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, - [6] = -10, + [6] = ITEM6_SUBTRACT_EV, [7] = 10, [8] = 5, [9] = 2, @@ -379,7 +379,7 @@ const u8 gItemEffect_QualotBerry[10] = { const u8 gItemEffect_HondewBerry[10] = { [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, - [6] = -10, + [6] = ITEM6_SUBTRACT_EV, [7] = 10, [8] = 5, [9] = 2, @@ -387,7 +387,7 @@ const u8 gItemEffect_HondewBerry[10] = { const u8 gItemEffect_GrepaBerry[10] = { [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, - [6] = -10, + [6] = ITEM6_SUBTRACT_EV, [7] = 10, [8] = 5, [9] = 2, @@ -395,7 +395,7 @@ const u8 gItemEffect_GrepaBerry[10] = { const u8 gItemEffect_TamatoBerry[10] = { [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, - [6] = -10, + [6] = ITEM6_SUBTRACT_EV, [7] = 10, [8] = 5, [9] = 2, |