Tweaked the X Items' effects' entries in src/data/pokemon/item_effects.h

This commit is contained in:
LOuroboros 2020-12-08 16:20:04 -03:00
parent 2a251e7551
commit c496e0ce6c

View file

@ -325,42 +325,66 @@ const u8 gItemEffect_DireHit[8] = {
}; };
const u8 gItemEffect_XAttack[8] = { const u8 gItemEffect_XAttack[8] = {
#if X_ITEMS_REWORK == TRUE
[1] = ITEM1_X_ATTACK,
#else
[0] = 1, [0] = 1,
#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XDefend[8] = { const u8 gItemEffect_XDefend[8] = {
#if X_ITEMS_REWORK == TRUE
[1] = ITEM1_X_DEFEND,
#else
[1] = 1 << 4, [1] = 1 << 4,
#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XSpeed[8] = { const u8 gItemEffect_XSpeed[8] = {
#if X_ITEMS_REWORK == TRUE
[1] = ITEM1_X_SPEED,
#else
[1] = 1, [1] = 1,
#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XAccuracy[8] = { const u8 gItemEffect_XAccuracy[8] = {
#if X_ITEMS_REWORK == TRUE
[1] = ITEM1_X_ACCURACY,
#else
[2] = 1 << 4, [2] = 1 << 4,
#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XSpecialAttack[8] = { const u8 gItemEffect_XSpecialAttack[8] = {
#if X_ITEMS_REWORK == TRUE
[1] = ITEM1_X_SPATK,
#else
[2] = 1, [2] = 1,
#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XSpecialDefense[8] = { const u8 gItemEffect_XSpecialDefense[8] = {
#if X_ITEMS_REWORK == TRUE
[1] = ITEM1_X_SPDEF,
#else
[2] = 1, [2] = 1,
#endif
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,