atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added constant labels for EV manipulating item effects

Browse source
This commit is contained in:
LOuroboros 2021-02-12 06:53:04 -03:00
parent 987fdf6fcd
commit 21ee6cb9fb
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/constants/item_effects.h
View file

@ -56,6 +56,10 @@
#define ITEM6_HEAL_HALF ((u8) -2)
#define ITEM6_HEAL_LVL_UP ((u8) -3)
// Amount of EV modified by ITEM4_EV_HP, ITEM4_EV_ATK, ITEM5_EV_DEF, ITEM5_EV_SPEED, ITEM5_EV_SPDEF and ITEM5_EV_SPATK
#define ITEM6_ADD_EV 10
#define ITEM6_SUBTRACT_EV -10
// Used for GetItemEffectType.
#define ITEM_EFFECT_X_ITEM 0
#define ITEM_EFFECT_RAISE_LEVEL 1

24
src/data/pokemon/item_effects.h
View file

@ -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,