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

Updated gItemEffectTable

Browse Source 
-Rearranged the entries therein, keeping them consistent with the item ID order.
-Removed pointless duplicates of certain effects such as the Full Heal's.
-Added entries for the items that needed one.
-gItemEffect_EvoStone -> gItemEffect_EvoItem.
This commit is contained in:
LOuroboros 2022-01-01 19:01:03 -03:00
parent 5cdfe0a9fb
commit b88d9c4cdc
1 changed files with 123 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
src/data/pokemon/item_effects.h
View File

@ -161,10 +161,6 @@ const u8 gItemEffect_MaxElixir[7] = {
[6] = ITEM6_HEAL_PP_FULL, [6] = ITEM6_HEAL_PP_FULL,
}; };
const u8 gItemEffect_LavaCookie[6] = {
[3] = ITEM3_STATUS_ALL,
};
const u8 gItemEffect_BlueFlute[6] = { const u8 gItemEffect_BlueFlute[6] = {
[3] = ITEM3_SLEEP, [3] = ITEM3_SLEEP,
}; };
@ -182,19 +178,6 @@ const u8 gItemEffect_BerryJuice[7] = {
[6] = 20, // Amount of HP to recover [6] = 20, // Amount of HP to recover
}; };
const u8 gItemEffect_SweetHeart[7] = {
[4] = ITEM4_HEAL_HP,
[6] = 20,
};
const u8 gItemEffect_BigMalasada[6] = {
[3] = ITEM3_STATUS_ALL,
};
const u8 gItemEffect_OldGateau[6] = {
[3] = ITEM3_STATUS_ALL,
};
const u8 gItemEffect_SacredAsh[7] = { const u8 gItemEffect_SacredAsh[7] = {
[0] = ITEM0_SACRED_ASH, [0] = ITEM0_SACRED_ASH,
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
@ -396,7 +379,7 @@ const u8 gItemEffect_XSpecialDefense[8] = {
STAT_BOOST_FRIENDSHIP_CHANGE, STAT_BOOST_FRIENDSHIP_CHANGE,
}; };
const u8 gItemEffect_EvoStone[6] = { const u8 gItemEffect_EvoItem[6] = {
[4] = ITEM4_EVO_STONE, [4] = ITEM4_EVO_STONE,
}; };
@ -434,10 +417,6 @@ const u8 gItemEffect_PersimBerry[6] = {
[3] = ITEM3_CONFUSION, [3] = ITEM3_CONFUSION,
}; };
const u8 gItemEffect_LumBerry[6] = {
[3] = ITEM3_STATUS_ALL,
};
const u8 gItemEffect_SitrusBerry[7] = { const u8 gItemEffect_SitrusBerry[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
#if I_SITRUS_BERRY_HEAL >= GEN_4 #if I_SITRUS_BERRY_HEAL >= GEN_4
@ -492,88 +471,126 @@ const u8 gItemEffect_TamatoBerry[10] = {
const u8 *const gItemEffectTable[] = const u8 *const gItemEffectTable[] =
{ {
[ITEM_POTION - ITEM_POTION] = gItemEffect_Potion, // Medicine
[ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote, [ITEM_POTION - ITEM_POTION] = gItemEffect_Potion,
[ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal, [ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion,
[ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal, [ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion,
[ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening, [ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion,
[ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal, [ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore,
[ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore, [ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive,
[ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion, [ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive,
[ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion, [ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater,
[ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion, [ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop,
[ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal, [ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade,
[ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive, [ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk,
[ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive, [ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder,
[ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater, [ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot,
[ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop, [ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder,
[ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade, [ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb,
[ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk, [ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote,
[ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder, [ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal,
[ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot, [ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal,
[ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder, [ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal,
[ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb, [ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening,
[ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether, [ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther, [ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether,
[ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir, [ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther,
[ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir, [ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir,
[ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_LavaCookie, [ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir,
[ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute, [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice,
[ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute, [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh,
[ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute, [ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_Potion,
[ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice, [ITEM_MAX_HONEY - ITEM_POTION] = gItemEffect_MaxRevive,
[ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_SweetHeart,
[ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_BigMalasada, // Regional Specialties
[ITEM_OLD_GATEAU - ITEM_POTION] = gItemEffect_OldGateau, [ITEM_PEWTER_CRUNCHIES - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh, [ITEM_RAGE_CANDY_BAR - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp, [ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein, [ITEM_OLD_GATEAU - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_IRON - ITEM_POTION] = gItemEffect_Iron, [ITEM_CASTELIACONE - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos, [ITEM_LUMIOSE_GALETTE - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium, [ITEM_SHALOUR_SABLE - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy, [ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_FullHeal,
[ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp,
[ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc, // Vitamins
[ITEM_HEALTH_FEATHER - ITEM_POTION] = gItemEffect_HpFeather, [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp,
[ITEM_MUSCLE_FEATHER - ITEM_POTION] = gItemEffect_AtkFeather, [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein,
[ITEM_RESIST_FEATHER - ITEM_POTION] = gItemEffect_DefFeather, [ITEM_IRON - ITEM_POTION] = gItemEffect_Iron,
[ITEM_GENIUS_FEATHER - ITEM_POTION] = gItemEffect_SpatkFeather, [ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium,
[ITEM_CLEVER_FEATHER - ITEM_POTION] = gItemEffect_SpdefFeather, [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc,
[ITEM_SWIFT_FEATHER - ITEM_POTION] = gItemEffect_SpeedFeather, [ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos,
[ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax, [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp,
[ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec, [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax,
[ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit,
[ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack, // EV Feathers
[ITEM_X_DEFENSE - ITEM_POTION] = gItemEffect_XDefense, [ITEM_HEALTH_FEATHER - ITEM_POTION] = gItemEffect_HpFeather,
[ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed, [ITEM_MUSCLE_FEATHER - ITEM_POTION] = gItemEffect_AtkFeather,
[ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy, [ITEM_RESIST_FEATHER - ITEM_POTION] = gItemEffect_DefFeather,
[ITEM_X_SP_ATK - ITEM_POTION] = gItemEffect_XSpecialAttack, [ITEM_GENIUS_FEATHER - ITEM_POTION] = gItemEffect_SpatkFeather,
[ITEM_X_SP_DEF - ITEM_POTION] = gItemEffect_XSpecialDefense, [ITEM_CLEVER_FEATHER - ITEM_POTION] = gItemEffect_SpdefFeather,
[ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_EvoStone, [ITEM_SWIFT_FEATHER - ITEM_POTION] = gItemEffect_SpeedFeather,
[ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_EvoStone,
[ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_EvoStone, // Candy
[ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_EvoStone, [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy,
[ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_EvoStone, //[ITEM_EXP_CANDY_XS - ITEM_POTION] = gItemEffect_ExpCandy, // Todo
[ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_EvoStone, //[ITEM_EXP_CANDY_S - ITEM_POTION] = gItemEffect_ExpCandy, // Todo
[ITEM_DAWN_STONE - ITEM_POTION] = gItemEffect_EvoStone, //[ITEM_EXP_CANDY_M - ITEM_POTION] = gItemEffect_ExpCandy, // Todo
[ITEM_DUSK_STONE - ITEM_POTION] = gItemEffect_EvoStone, //[ITEM_EXP_CANDY_L - ITEM_POTION] = gItemEffect_ExpCandy, // Todo
[ITEM_SHINY_STONE - ITEM_POTION] = gItemEffect_EvoStone, //[ITEM_EXP_CANDY_XL - ITEM_POTION] = gItemEffect_ExpCandy, // Todo
[ITEM_ICE_STONE - ITEM_POTION] = gItemEffect_EvoStone, //[ITEM_DYNAMAX_CANDY - ITEM_POTION] = gItemEffect_DynamaxCandy, // Todo
[ITEM_CHERI_BERRY - ITEM_POTION] = gItemEffect_CheriBerry,
[ITEM_CHESTO_BERRY - ITEM_POTION] = gItemEffect_ChestoBerry, // Medicinal Flutes
[ITEM_PECHA_BERRY - ITEM_POTION] = gItemEffect_PechaBerry, [ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute,
[ITEM_RAWST_BERRY - ITEM_POTION] = gItemEffect_RawstBerry, [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute,
[ITEM_ASPEAR_BERRY - ITEM_POTION] = gItemEffect_AspearBerry, [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute,
[ITEM_LEPPA_BERRY - ITEM_POTION] = gItemEffect_LeppaBerry,
[ITEM_ORAN_BERRY - ITEM_POTION] = gItemEffect_OranBerry, // X Items
[ITEM_PERSIM_BERRY - ITEM_POTION] = gItemEffect_PersimBerry, [ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack,
[ITEM_LUM_BERRY - ITEM_POTION] = gItemEffect_LumBerry, [ITEM_X_DEFENSE - ITEM_POTION] = gItemEffect_XDefense,
[ITEM_SITRUS_BERRY - ITEM_POTION] = gItemEffect_SitrusBerry, [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed,
[ITEM_POMEG_BERRY - ITEM_POTION] = gItemEffect_PomegBerry, [ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy,
[ITEM_KELPSY_BERRY - ITEM_POTION] = gItemEffect_KelpsyBerry, [ITEM_X_SP_ATK - ITEM_POTION] = gItemEffect_XSpecialAttack,
[ITEM_QUALOT_BERRY - ITEM_POTION] = gItemEffect_QualotBerry, [ITEM_X_SP_DEF - ITEM_POTION] = gItemEffect_XSpecialDefense,
[ITEM_HONDEW_BERRY - ITEM_POTION] = gItemEffect_HondewBerry,
[ITEM_GREPA_BERRY - ITEM_POTION] = gItemEffect_GrepaBerry, [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit,
[ITEM_TAMATO_BERRY - ITEM_POTION] = gItemEffect_TamatoBerry, [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec,
[LAST_BERRY_INDEX - ITEM_POTION] = NULL
//[ITEM_MAX_MUSHROOMS - ITEM_POTION] = gItemEffect_MaxMushrooms, // Todo
// Evolution Items
[ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_ICE_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_SHINY_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_DUSK_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_DAWN_STONE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_SWEET_APPLE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_TART_APPLE - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_CRACKED_POT - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_CHIPPED_POT - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_GALARICA_CUFF - ITEM_POTION] = gItemEffect_EvoItem,
[ITEM_GALARICA_WREATH - ITEM_POTION] = gItemEffect_EvoItem,
// Berries
[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_FullHeal,
[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,
}; };