summaryrefslogtreecommitdiff
path: root/src/data/pokemon/item_effects.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/data/pokemon/item_effects.h')
-rw-r--r--src/data/pokemon/item_effects.h325
1 files changed, 153 insertions, 172 deletions
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
index 1d7f16b90..00872a9b2 100644
--- a/src/data/pokemon/item_effects.h
+++ b/src/data/pokemon/item_effects.h
@@ -1,6 +1,6 @@
const u8 gItemEffect_Potion[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 20,
+ [6] = 20, // Amount of HP to recover
};
const u8 gItemEffect_Antidote[6] = {
@@ -26,22 +26,22 @@ const u8 gItemEffect_ParalyzeHeal[6] = {
const u8 gItemEffect_FullRestore[7] = {
[3] = ITEM3_STATUS_ALL,
[4] = ITEM4_HEAL_HP,
- [6] = ITEM6_HEAL_FULL,
+ [6] = ITEM6_HEAL_HP_FULL,
};
const u8 gItemEffect_MaxPotion[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = ITEM6_HEAL_FULL,
+ [6] = ITEM6_HEAL_HP_FULL,
};
const u8 gItemEffect_HyperPotion[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 200,
+ [6] = 200, // Amount of HP to recover
};
const u8 gItemEffect_SuperPotion[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 50,
+ [6] = 50, // Amount of HP to recover
};
const u8 gItemEffect_FullHeal[6] = {
@@ -50,87 +50,87 @@ const u8 gItemEffect_FullHeal[6] = {
const u8 gItemEffect_Revive[7] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
- [6] = ITEM6_HEAL_HALF,
+ [6] = ITEM6_HEAL_HP_HALF,
};
const u8 gItemEffect_MaxRevive[7] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
- [6] = ITEM6_HEAL_FULL,
+ [6] = ITEM6_HEAL_HP_FULL,
};
const u8 gItemEffect_FreshWater[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 50,
+ [6] = 50, // Amount of HP to recover
};
const u8 gItemEffect_SodaPop[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 60,
+ [6] = 60, // Amount of HP to recover
};
const u8 gItemEffect_Lemonade[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 80,
+ [6] = 80, // Amount of HP to recover
};
const u8 gItemEffect_MoomooMilk[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 100,
+ [6] = 100, // Amount of HP to recover
};
const u8 gItemEffect_EnergyPowder[10] = {
[4] = ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = 50,
- [7] = -5,
- [8] = -5,
- [9] = -10,
+ [6] = 50, // Amount of HP to recover
+ [7] = -5, // Friendship change, low
+ [8] = -5, // Friendship change, mid
+ [9] = -10, // Friendship change, high
};
const u8 gItemEffect_EnergyRoot[10] = {
[4] = ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = 200,
- [7] = -10,
- [8] = -10,
- [9] = -15,
+ [6] = 200, // Amount of HP to recover
+ [7] = -10, // Friendship change, low
+ [8] = -10, // Friendship change, mid
+ [9] = -15, // Friendship change, high
};
const u8 gItemEffect_HealPowder[9] = {
[3] = ITEM3_STATUS_ALL,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = -5,
- [7] = -5,
- [8] = -10,
+ [6] = -5, // Friendship change, low
+ [7] = -5, // Friendship change, mid
+ [8] = -10, // Friendship change, high
};
const u8 gItemEffect_RevivalHerb[10] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = ITEM6_HEAL_FULL,
- [7] = -15,
- [8] = -15,
- [9] = -20,
+ [6] = ITEM6_HEAL_HP_FULL,
+ [7] = -15, // Friendship change, low
+ [8] = -15, // Friendship change, mid
+ [9] = -20, // Friendship change, high
};
const u8 gItemEffect_Ether[7] = {
- [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
+ [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP,
[6] = 10,
};
const u8 gItemEffect_MaxEther[7] = {
- [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
- [6] = 0x7F,
+ [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP,
+ [6] = ITEM6_HEAL_PP_FULL,
};
const u8 gItemEffect_Elixir[7] = {
- [4] = ITEM4_HEAL_PP_ALL,
- [6] = 10,
+ [4] = ITEM4_HEAL_PP,
+ [6] = 10, // Amount of PP to recover
};
const u8 gItemEffect_MaxElixir[7] = {
- [4] = ITEM4_HEAL_PP_ALL,
- [6] = 0x7F,
+ [4] = ITEM4_HEAL_PP,
+ [6] = ITEM6_HEAL_PP_FULL,
};
const u8 gItemEffect_LavaCookie[6] = {
@@ -151,137 +151,125 @@ const u8 gItemEffect_RedFlute[6] = {
const u8 gItemEffect_BerryJuice[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 20,
+ [6] = 20, // Amount of HP to recover
};
const u8 gItemEffect_SacredAsh[7] = {
[0] = ITEM0_SACRED_ASH,
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
- [6] = ITEM6_HEAL_FULL,
+ [6] = ITEM6_HEAL_HP_FULL,
};
+#define VITAMIN_FRIENDSHIP_CHANGE(i) \
+ [(i) + 0] = 5, /* Friendship change, low */ \
+ [(i) + 1] = 3, /* Friendship change, mid */ \
+ [(i) + 2] = 2 /* Friendship change, high */
+
const u8 gItemEffect_HPUp[10] = {
[4] = ITEM4_EV_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_ADD_EV,
- [7] = 5,
- [8] = 3,
- [9] = 2,
+ VITAMIN_FRIENDSHIP_CHANGE(7),
};
const u8 gItemEffect_Protein[10] = {
[4] = ITEM4_EV_ATK,
[5] = ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_ADD_EV,
- [7] = 5,
- [8] = 3,
- [9] = 2,
+ VITAMIN_FRIENDSHIP_CHANGE(7),
};
const u8 gItemEffect_Iron[10] = {
[5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_ADD_EV,
- [7] = 5,
- [8] = 3,
- [9] = 2,
+ VITAMIN_FRIENDSHIP_CHANGE(7),
};
const u8 gItemEffect_Carbos[10] = {
[5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_ADD_EV,
- [7] = 5,
- [8] = 3,
- [9] = 2,
+ VITAMIN_FRIENDSHIP_CHANGE(7),
};
const u8 gItemEffect_Calcium[10] = {
[5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_ADD_EV,
- [7] = 5,
- [8] = 3,
- [9] = 2,
+ VITAMIN_FRIENDSHIP_CHANGE(7),
};
const u8 gItemEffect_RareCandy[10] = {
[3] = ITEM3_LEVEL_UP,
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = ITEM6_HEAL_LVL_UP,
- [7] = 5,
- [8] = 3,
- [9] = 2,
+ [6] = ITEM6_HEAL_HP_LVL_UP,
+ VITAMIN_FRIENDSHIP_CHANGE(7),
};
const u8 gItemEffect_PPUp[9] = {
[4] = ITEM4_PP_UP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = 5,
- [7] = 3,
- [8] = 2,
+ VITAMIN_FRIENDSHIP_CHANGE(6),
};
const u8 gItemEffect_Zinc[10] = {
[5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_ADD_EV,
- [7] = 5,
- [8] = 3,
- [9] = 2,
+ VITAMIN_FRIENDSHIP_CHANGE(7),
};
const u8 gItemEffect_PPMax[9] = {
[5] = ITEM5_PP_MAX | ITEM5_FRIENDSHIP_ALL,
- [6] = 5,
- [7] = 3,
- [8] = 2,
+ VITAMIN_FRIENDSHIP_CHANGE(6),
};
+#define STAT_BOOST_FRIENDSHIP_CHANGE \
+ [6] = 1, /* Friendship change, low */ \
+ [7] = 1 /* Friendship change, mid */
+
const u8 gItemEffect_GuardSpec[8] = {
[3] = ITEM3_GUARD_SPEC,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
- [6] = 1,
- [7] = 1,
+ STAT_BOOST_FRIENDSHIP_CHANGE,
};
+// The first item effect value for the stat boost items
+// only uses the least significant bit of its full mask.
+// The full constant is commented next to it
+
const u8 gItemEffect_DireHit[8] = {
- [0] = 2 << 4,
+ [0] = 1 << 5, // ITEM0_DIRE_HIT
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
- [6] = 1,
- [7] = 1,
+ STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XAttack[8] = {
- [0] = 1,
+ [0] = 1, // ITEM0_X_ATTACK
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
- [6] = 1,
- [7] = 1,
+ STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XDefend[8] = {
- [1] = 1 << 4,
+ [1] = 1 << 4, /// ITEM1_X_DEFEND
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
- [6] = 1,
- [7] = 1,
+ STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XSpeed[8] = {
- [1] = 1,
+ [1] = 1, // ITEM1_X_SPEED
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
- [6] = 1,
- [7] = 1,
+ STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XAccuracy[8] = {
- [2] = 1 << 4,
+ [2] = 1 << 4, // ITEM2_X_ACCURACY
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
- [6] = 1,
- [7] = 1,
+ STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_XSpecial[8] = {
- [2] = 1,
+ [2] = 1, // ITEM2_X_SPATK
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
- [6] = 1,
- [7] = 1,
+ STAT_BOOST_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_SunStone[6] = {
@@ -329,13 +317,13 @@ const u8 gItemEffect_AspearBerry[6] = {
};
const u8 gItemEffect_LeppaBerry[7] = {
- [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
- [6] = 10,
+ [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP,
+ [6] = 10, // Amount of PP to recover
};
const u8 gItemEffect_OranBerry[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 10,
+ [6] = 10, // Amount of HP to recover
};
const u8 gItemEffect_PersimBerry[6] = {
@@ -348,129 +336,122 @@ const u8 gItemEffect_LumBerry[6] = {
const u8 gItemEffect_SitrusBerry[7] = {
[4] = ITEM4_HEAL_HP,
- [6] = 30,
+ [6] = 30, // Amount of HP to recover
};
+#define EV_BERRY_FRIENDSHIP_CHANGE \
+ [7] = 10, /* Friendship change, low */ \
+ [8] = 5, /* Friendship change, mid */ \
+ [9] = 2 /* Friendship change, high */
+
const u8 gItemEffect_PomegBerry[10] = {
[4] = ITEM4_EV_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_SUBTRACT_EV,
- [7] = 10,
- [8] = 5,
- [9] = 2,
+ EV_BERRY_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_KelpsyBerry[10] = {
[4] = ITEM4_EV_ATK,
[5] = ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_SUBTRACT_EV,
- [7] = 10,
- [8] = 5,
- [9] = 2,
+ EV_BERRY_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_QualotBerry[10] = {
[5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_SUBTRACT_EV,
- [7] = 10,
- [8] = 5,
- [9] = 2,
+ EV_BERRY_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_HondewBerry[10] = {
[5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_SUBTRACT_EV,
- [7] = 10,
- [8] = 5,
- [9] = 2,
+ EV_BERRY_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_GrepaBerry[10] = {
[5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_SUBTRACT_EV,
- [7] = 10,
- [8] = 5,
- [9] = 2,
+ EV_BERRY_FRIENDSHIP_CHANGE,
};
const u8 gItemEffect_TamatoBerry[10] = {
[5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
[6] = ITEM6_SUBTRACT_EV,
- [7] = 10,
- [8] = 5,
- [9] = 2,
+ EV_BERRY_FRIENDSHIP_CHANGE,
};
const u8 *const gItemEffectTable[] =
{
- [ITEM_POTION - ITEM_POTION] = gItemEffect_Potion,
- [ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote,
- [ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal,
- [ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal,
- [ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening,
+ [ITEM_POTION - ITEM_POTION] = gItemEffect_Potion,
+ [ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote,
+ [ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal,
+ [ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal,
+ [ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening,
[ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal,
- [ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore,
- [ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion,
- [ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion,
- [ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion,
- [ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal,
- [ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive,
- [ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive,
- [ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater,
- [ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop,
- [ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade,
- [ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk,
+ [ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore,
+ [ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion,
+ [ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion,
+ [ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion,
+ [ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal,
+ [ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive,
+ [ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive,
+ [ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater,
+ [ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop,
+ [ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade,
+ [ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk,
[ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder,
- [ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot,
- [ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder,
- [ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb,
- [ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether,
- [ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther,
- [ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir,
- [ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir,
- [ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_LavaCookie,
- [ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute,
- [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute,
- [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute,
- [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice,
- [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh,
- [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp,
- [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein,
- [ITEM_IRON - ITEM_POTION] = gItemEffect_Iron,
- [ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos,
- [ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium,
- [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy,
- [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp,
- [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc,
- [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax,
- [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec,
- [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit,
- [ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack,
- [ITEM_X_DEFEND - ITEM_POTION] = gItemEffect_XDefend,
- [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed,
- [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy,
- [ITEM_X_SPECIAL - ITEM_POTION] = gItemEffect_XSpecial,
- [ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_SunStone,
- [ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_MoonStone,
- [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_FireStone,
+ [ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot,
+ [ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder,
+ [ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb,
+ [ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether,
+ [ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther,
+ [ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir,
+ [ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir,
+ [ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_LavaCookie,
+ [ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute,
+ [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute,
+ [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute,
+ [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice,
+ [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh,
+ [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp,
+ [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein,
+ [ITEM_IRON - ITEM_POTION] = gItemEffect_Iron,
+ [ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos,
+ [ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium,
+ [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy,
+ [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp,
+ [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc,
+ [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax,
+ [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec,
+ [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit,
+ [ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack,
+ [ITEM_X_DEFEND - ITEM_POTION] = gItemEffect_XDefend,
+ [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed,
+ [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy,
+ [ITEM_X_SPECIAL - ITEM_POTION] = gItemEffect_XSpecial,
+ [ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_SunStone,
+ [ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_MoonStone,
+ [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_FireStone,
[ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_ThunderStone,
- [ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_WaterStone,
- [ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_LeafStone,
- [ITEM_CHERI_BERRY - ITEM_POTION] = gItemEffect_CheriBerry,
- [ITEM_CHESTO_BERRY - ITEM_POTION] = gItemEffect_ChestoBerry,
- [ITEM_PECHA_BERRY - ITEM_POTION] = gItemEffect_PechaBerry,
- [ITEM_RAWST_BERRY - ITEM_POTION] = gItemEffect_RawstBerry,
- [ITEM_ASPEAR_BERRY - ITEM_POTION] = gItemEffect_AspearBerry,
- [ITEM_LEPPA_BERRY - ITEM_POTION] = gItemEffect_LeppaBerry,
- [ITEM_ORAN_BERRY - ITEM_POTION] = gItemEffect_OranBerry,
- [ITEM_PERSIM_BERRY - ITEM_POTION] = gItemEffect_PersimBerry,
- [ITEM_LUM_BERRY - ITEM_POTION] = gItemEffect_LumBerry,
- [ITEM_SITRUS_BERRY - ITEM_POTION] = gItemEffect_SitrusBerry,
- [ITEM_POMEG_BERRY - ITEM_POTION] = gItemEffect_PomegBerry,
- [ITEM_KELPSY_BERRY - ITEM_POTION] = gItemEffect_KelpsyBerry,
- [ITEM_QUALOT_BERRY - ITEM_POTION] = gItemEffect_QualotBerry,
- [ITEM_HONDEW_BERRY - ITEM_POTION] = gItemEffect_HondewBerry,
- [ITEM_GREPA_BERRY - ITEM_POTION] = gItemEffect_GrepaBerry,
- [ITEM_TAMATO_BERRY - ITEM_POTION] = gItemEffect_TamatoBerry,
- [LAST_BERRY_INDEX - ITEM_POTION] = NULL
+ [ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_WaterStone,
+ [ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_LeafStone,
+ [ITEM_CHERI_BERRY - ITEM_POTION] = gItemEffect_CheriBerry,
+ [ITEM_CHESTO_BERRY - ITEM_POTION] = gItemEffect_ChestoBerry,
+ [ITEM_PECHA_BERRY - ITEM_POTION] = gItemEffect_PechaBerry,
+ [ITEM_RAWST_BERRY - ITEM_POTION] = gItemEffect_RawstBerry,
+ [ITEM_ASPEAR_BERRY - ITEM_POTION] = gItemEffect_AspearBerry,
+ [ITEM_LEPPA_BERRY - ITEM_POTION] = gItemEffect_LeppaBerry,
+ [ITEM_ORAN_BERRY - ITEM_POTION] = gItemEffect_OranBerry,
+ [ITEM_PERSIM_BERRY - ITEM_POTION] = gItemEffect_PersimBerry,
+ [ITEM_LUM_BERRY - ITEM_POTION] = gItemEffect_LumBerry,
+ [ITEM_SITRUS_BERRY - ITEM_POTION] = gItemEffect_SitrusBerry,
+ [ITEM_POMEG_BERRY - ITEM_POTION] = gItemEffect_PomegBerry,
+ [ITEM_KELPSY_BERRY - ITEM_POTION] = gItemEffect_KelpsyBerry,
+ [ITEM_QUALOT_BERRY - ITEM_POTION] = gItemEffect_QualotBerry,
+ [ITEM_HONDEW_BERRY - ITEM_POTION] = gItemEffect_HondewBerry,
+ [ITEM_GREPA_BERRY - ITEM_POTION] = gItemEffect_GrepaBerry,
+ [ITEM_TAMATO_BERRY - ITEM_POTION] = gItemEffect_TamatoBerry,
+ [LAST_BERRY_INDEX - ITEM_POTION] = NULL
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-22 20:23:31 +0000