diff options
Diffstat (limited to 'src/data/pokemon')
-rw-r--r-- | src/data/pokemon/item_effects.h | 305 | ||||
-rw-r--r-- | src/data/pokemon/tmhm_learnsets.h | 4 | ||||
-rw-r--r-- | src/data/pokemon/trainer_class_lookups.h | 302 |
3 files changed, 279 insertions, 332 deletions
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index a5b5e9f81..31a78a748 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -1,84 +1,84 @@ -const u8 gItemEffect_Potion[7] = { +static const u8 sItemEffect_Potion[7] = { [4] = ITEM4_HEAL_HP, [6] = 20, }; -const u8 gItemEffect_Antidote[6] = { +static const u8 sItemEffect_Antidote[6] = { [3] = ITEM3_POISON, }; -const u8 gItemEffect_BurnHeal[6] = { +static const u8 sItemEffect_BurnHeal[6] = { [3] = ITEM3_BURN, }; -const u8 gItemEffect_IceHeal[6] = { +static const u8 sItemEffect_IceHeal[6] = { [3] = ITEM3_FREEZE, }; -const u8 gItemEffect_Awakening[6] = { +static const u8 sItemEffect_Awakening[6] = { [3] = ITEM3_SLEEP, }; -const u8 gItemEffect_ParalyzeHeal[6] = { +static const u8 sItemEffect_ParalyzeHeal[6] = { [3] = ITEM3_PARALYSIS, }; -const u8 gItemEffect_FullRestore[7] = { +static const u8 sItemEffect_FullRestore[7] = { [3] = ITEM3_STATUS_ALL, [4] = ITEM4_HEAL_HP, [6] = -1, }; -const u8 gItemEffect_MaxPotion[7] = { +static const u8 sItemEffect_MaxPotion[7] = { [4] = ITEM4_HEAL_HP, [6] = -1, }; -const u8 gItemEffect_HyperPotion[7] = { +static const u8 sItemEffect_HyperPotion[7] = { [4] = ITEM4_HEAL_HP, [6] = 200, }; -const u8 gItemEffect_SuperPotion[7] = { +static const u8 sItemEffect_SuperPotion[7] = { [4] = ITEM4_HEAL_HP, [6] = 50, }; -const u8 gItemEffect_FullHeal[6] = { +static const u8 sItemEffect_FullHeal[6] = { [3] = ITEM3_STATUS_ALL, }; -const u8 gItemEffect_Revive[7] = { +static const u8 sItemEffect_Revive[7] = { [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [6] = -2, }; -const u8 gItemEffect_MaxRevive[7] = { +static const u8 sItemEffect_MaxRevive[7] = { [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [6] = -1, }; -const u8 gItemEffect_FreshWater[7] = { +static const u8 sItemEffect_FreshWater[7] = { [4] = ITEM4_HEAL_HP, [6] = 50, }; -const u8 gItemEffect_SodaPop[7] = { +static const u8 sItemEffect_SodaPop[7] = { [4] = ITEM4_HEAL_HP, [6] = 60, }; -const u8 gItemEffect_Lemonade[7] = { +static const u8 sItemEffect_Lemonade[7] = { [4] = ITEM4_HEAL_HP, [6] = 80, }; -const u8 gItemEffect_MoomooMilk[7] = { +static const u8 sItemEffect_MoomooMilk[7] = { [4] = ITEM4_HEAL_HP, [6] = 100, }; -const u8 gItemEffect_EnergyPowder[10] = { +static const u8 sItemEffect_EnergyPowder[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 50, @@ -87,7 +87,7 @@ const u8 gItemEffect_EnergyPowder[10] = { [9] = -10, }; -const u8 gItemEffect_EnergyRoot[10] = { +static const u8 sItemEffect_EnergyRoot[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 200, @@ -96,7 +96,7 @@ const u8 gItemEffect_EnergyRoot[10] = { [9] = -15, }; -const u8 gItemEffect_HealPowder[9] = { +static const u8 sItemEffect_HealPowder[9] = { [3] = ITEM3_STATUS_ALL, [5] = ITEM5_FRIENDSHIP_ALL, [6] = -5, @@ -104,7 +104,7 @@ const u8 gItemEffect_HealPowder[9] = { [8] = -10, }; -const u8 gItemEffect_RevivalHerb[10] = { +static const u8 sItemEffect_RevivalHerb[10] = { [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, [6] = -1, @@ -113,54 +113,54 @@ const u8 gItemEffect_RevivalHerb[10] = { [9] = -20, }; -const u8 gItemEffect_Ether[7] = { +static const u8 sItemEffect_Ether[7] = { [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL, [6] = 10, }; -const u8 gItemEffect_MaxEther[7] = { +static const u8 sItemEffect_MaxEther[7] = { [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL, [6] = 0x7F, }; -const u8 gItemEffect_Elixir[7] = { +static const u8 sItemEffect_Elixir[7] = { [4] = ITEM4_HEAL_PP_ALL, [6] = 10, }; -const u8 gItemEffect_MaxElixir[7] = { +static const u8 sItemEffect_MaxElixir[7] = { [4] = ITEM4_HEAL_PP_ALL, [6] = 0x7F, }; -const u8 gItemEffect_LavaCookie[6] = { +static const u8 sItemEffect_LavaCookie[6] = { [3] = ITEM3_STATUS_ALL, }; -const u8 gItemEffect_BlueFlute[6] = { +static const u8 sItemEffect_BlueFlute[6] = { [3] = ITEM3_SLEEP, }; -const u8 gItemEffect_YellowFlute[6] = { +static const u8 sItemEffect_YellowFlute[6] = { [3] = ITEM3_CONFUSION, }; -const u8 gItemEffect_RedFlute[6] = { +static const u8 sItemEffect_RedFlute[6] = { [0] = ITEM0_INFATUATION, }; -const u8 gItemEffect_BerryJuice[7] = { +static const u8 sItemEffect_BerryJuice[7] = { [4] = ITEM4_HEAL_HP, [6] = 20, }; -const u8 gItemEffect_SacredAsh[7] = { +static const u8 sItemEffect_SacredAsh[7] = { [0] = ITEM0_SACRED_ASH, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [6] = -1, }; -const u8 gItemEffect_HPUp[10] = { +static const u8 sItemEffect_HPUp[10] = { [4] = ITEM4_EV_HP, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 10, @@ -169,7 +169,7 @@ const u8 gItemEffect_HPUp[10] = { [9] = 2, }; -const u8 gItemEffect_Protein[10] = { +static const u8 sItemEffect_Protein[10] = { [4] = ITEM4_EV_ATK, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 10, @@ -178,7 +178,7 @@ const u8 gItemEffect_Protein[10] = { [9] = 2, }; -const u8 gItemEffect_Iron[10] = { +static const u8 sItemEffect_Iron[10] = { [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, @@ -186,7 +186,7 @@ const u8 gItemEffect_Iron[10] = { [9] = 2, }; -const u8 gItemEffect_Carbos[10] = { +static const u8 sItemEffect_Carbos[10] = { [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, @@ -194,7 +194,7 @@ const u8 gItemEffect_Carbos[10] = { [9] = 2, }; -const u8 gItemEffect_Calcium[10] = { +static const u8 sItemEffect_Calcium[10] = { [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, @@ -202,7 +202,7 @@ const u8 gItemEffect_Calcium[10] = { [9] = 2, }; -const u8 gItemEffect_RareCandy[10] = { +static const u8 sItemEffect_RareCandy[10] = { [3] = ITEM3_LEVEL_UP, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, @@ -212,7 +212,7 @@ const u8 gItemEffect_RareCandy[10] = { [9] = 2, }; -const u8 gItemEffect_PPUp[9] = { +static const u8 sItemEffect_PPUp[9] = { [4] = ITEM4_PP_UP, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 5, @@ -220,7 +220,7 @@ const u8 gItemEffect_PPUp[9] = { [8] = 2, }; -const u8 gItemEffect_Zinc[10] = { +static const u8 sItemEffect_Zinc[10] = { [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, @@ -228,246 +228,193 @@ const u8 gItemEffect_Zinc[10] = { [9] = 2, }; -const u8 gItemEffect_PPMax[9] = { +static const u8 sItemEffect_PPMax[9] = { [5] = ITEM5_PP_MAX | ITEM5_FRIENDSHIP_ALL, [6] = 5, [7] = 3, [8] = 2, }; -const u8 gItemEffect_GuardSpec[8] = { +static const u8 sItemEffect_GuardSpec[8] = { [3] = ITEM3_MIST, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, [7] = 1, }; -const u8 gItemEffect_DireHit[8] = { +static const u8 sItemEffect_DireHit[8] = { [0] = 2 << 4, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, [7] = 1, }; -const u8 gItemEffect_XAttack[8] = { +static const u8 sItemEffect_XAttack[8] = { [0] = 1, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, [7] = 1, }; -const u8 gItemEffect_XDefend[8] = { +static const u8 sItemEffect_XDefend[8] = { [1] = 1 << 4, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, [7] = 1, }; -const u8 gItemEffect_XSpeed[8] = { +static const u8 sItemEffect_XSpeed[8] = { [1] = 1, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, [7] = 1, }; -const u8 gItemEffect_XAccuracy[8] = { +static const u8 sItemEffect_XAccuracy[8] = { [2] = 1 << 4, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, [7] = 1, }; -const u8 gItemEffect_XSpecial[8] = { +static const u8 sItemEffect_XSpecial[8] = { [2] = 1, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, [7] = 1, }; -const u8 gItemEffect_SunStone[6] = { +static const u8 sItemEffect_SunStone[6] = { [4] = ITEM4_EVO_STONE, }; -const u8 gItemEffect_MoonStone[6] = { +static const u8 sItemEffect_MoonStone[6] = { [4] = ITEM4_EVO_STONE, }; -const u8 gItemEffect_FireStone[6] = { +static const u8 sItemEffect_FireStone[6] = { [4] = ITEM4_EVO_STONE, }; -const u8 gItemEffect_ThunderStone[6] = { +static const u8 sItemEffect_ThunderStone[6] = { [4] = ITEM4_EVO_STONE, }; -const u8 gItemEffect_WaterStone[6] = { +static const u8 sItemEffect_WaterStone[6] = { [4] = ITEM4_EVO_STONE, }; -const u8 gItemEffect_LeafStone[6] = { +static const u8 sItemEffect_LeafStone[6] = { [4] = ITEM4_EVO_STONE, }; -const u8 gItemEffect_CheriBerry[6] = { +static const u8 sItemEffect_CheriBerry[6] = { [3] = ITEM3_PARALYSIS, }; -const u8 gItemEffect_ChestoBerry[6] = { +static const u8 sItemEffect_ChestoBerry[6] = { [3] = ITEM3_SLEEP, }; -const u8 gItemEffect_PechaBerry[6] = { +static const u8 sItemEffect_PechaBerry[6] = { [3] = ITEM3_POISON, }; -const u8 gItemEffect_RawstBerry[6] = { +static const u8 sItemEffect_RawstBerry[6] = { [3] = ITEM3_BURN, }; -const u8 gItemEffect_AspearBerry[6] = { +static const u8 sItemEffect_AspearBerry[6] = { [3] = ITEM3_FREEZE, }; -const u8 gItemEffect_LeppaBerry[7] = { +static const u8 sItemEffect_LeppaBerry[7] = { [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL, [6] = 10, }; -const u8 gItemEffect_OranBerry[7] = { +static const u8 sItemEffect_OranBerry[7] = { [4] = ITEM4_HEAL_HP, [6] = 10, }; -const u8 gItemEffect_PersimBerry[6] = { +static const u8 sItemEffect_PersimBerry[6] = { [3] = ITEM3_CONFUSION, }; -const u8 gItemEffect_LumBerry[6] = { +static const u8 sItemEffect_LumBerry[6] = { [3] = ITEM3_STATUS_ALL, }; -const u8 gItemEffect_SitrusBerry[7] = { +static const u8 sItemEffect_SitrusBerry[7] = { [4] = ITEM4_HEAL_HP, [6] = 30, }; -// emerald berry effects -/* -const u8 gItemEffect_PomegBerry[10] = { - [4] = ITEM4_EV_HP, - [5] = ITEM5_FRIENDSHIP_ALL, - [6] = -10, - [7] = 10, - [8] = 5, - [9] = 2, -}; - -const u8 gItemEffect_KelpsyBerry[10] = { - [4] = ITEM4_EV_ATK, - [5] = ITEM5_FRIENDSHIP_ALL, - [6] = -10, - [7] = 10, - [8] = 5, - [9] = 2, -}; - -const u8 gItemEffect_QualotBerry[10] = { - [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, - [6] = -10, - [7] = 10, - [8] = 5, - [9] = 2, -}; - -const u8 gItemEffect_HondrewBerry[10] = { - [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, - [6] = -10, - [7] = 10, - [8] = 5, - [9] = 2, -}; - -const u8 gItemEffect_GrepaBerry[10] = { - [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, - [6] = -10, - [7] = 10, - [8] = 5, - [9] = 2, -}; - -const u8 gItemEffect_TamatoBerry[10] = { - [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, - [6] = -10, - [7] = 10, - [8] = 5, - [9] = 2, -}; -*/ - 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_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_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_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_POTION - ITEM_POTION] = sItemEffect_Potion, + [ITEM_ANTIDOTE - ITEM_POTION] = sItemEffect_Antidote, + [ITEM_BURN_HEAL - ITEM_POTION] = sItemEffect_BurnHeal, + [ITEM_ICE_HEAL - ITEM_POTION] = sItemEffect_IceHeal, + [ITEM_AWAKENING - ITEM_POTION] = sItemEffect_Awakening, + [ITEM_PARALYZE_HEAL - ITEM_POTION] = sItemEffect_ParalyzeHeal, + [ITEM_FULL_RESTORE - ITEM_POTION] = sItemEffect_FullRestore, + [ITEM_MAX_POTION - ITEM_POTION] = sItemEffect_MaxPotion, + [ITEM_HYPER_POTION - ITEM_POTION] = sItemEffect_HyperPotion, + [ITEM_SUPER_POTION - ITEM_POTION] = sItemEffect_SuperPotion, + [ITEM_FULL_HEAL - ITEM_POTION] = sItemEffect_FullHeal, + [ITEM_REVIVE - ITEM_POTION] = sItemEffect_Revive, + [ITEM_MAX_REVIVE - ITEM_POTION] = sItemEffect_MaxRevive, + [ITEM_FRESH_WATER - ITEM_POTION] = sItemEffect_FreshWater, + [ITEM_SODA_POP - ITEM_POTION] = sItemEffect_SodaPop, + [ITEM_LEMONADE - ITEM_POTION] = sItemEffect_Lemonade, + [ITEM_MOOMOO_MILK - ITEM_POTION] = sItemEffect_MoomooMilk, + [ITEM_ENERGY_POWDER - ITEM_POTION] = sItemEffect_EnergyPowder, + [ITEM_ENERGY_ROOT - ITEM_POTION] = sItemEffect_EnergyRoot, + [ITEM_HEAL_POWDER - ITEM_POTION] = sItemEffect_HealPowder, + [ITEM_REVIVAL_HERB - ITEM_POTION] = sItemEffect_RevivalHerb, + [ITEM_ETHER - ITEM_POTION] = sItemEffect_Ether, + [ITEM_MAX_ETHER - ITEM_POTION] = sItemEffect_MaxEther, + [ITEM_ELIXIR - ITEM_POTION] = sItemEffect_Elixir, + [ITEM_MAX_ELIXIR - ITEM_POTION] = sItemEffect_MaxElixir, + [ITEM_LAVA_COOKIE - ITEM_POTION] = sItemEffect_LavaCookie, + [ITEM_BLUE_FLUTE - ITEM_POTION] = sItemEffect_BlueFlute, + [ITEM_YELLOW_FLUTE - ITEM_POTION] = sItemEffect_YellowFlute, + [ITEM_RED_FLUTE - ITEM_POTION] = sItemEffect_RedFlute, + [ITEM_BERRY_JUICE - ITEM_POTION] = sItemEffect_BerryJuice, + [ITEM_SACRED_ASH - ITEM_POTION] = sItemEffect_SacredAsh, + [ITEM_HP_UP - ITEM_POTION] = sItemEffect_HPUp, + [ITEM_PROTEIN - ITEM_POTION] = sItemEffect_Protein, + [ITEM_IRON - ITEM_POTION] = sItemEffect_Iron, + [ITEM_CARBOS - ITEM_POTION] = sItemEffect_Carbos, + [ITEM_CALCIUM - ITEM_POTION] = sItemEffect_Calcium, + [ITEM_RARE_CANDY - ITEM_POTION] = sItemEffect_RareCandy, + [ITEM_PP_UP - ITEM_POTION] = sItemEffect_PPUp, + [ITEM_ZINC - ITEM_POTION] = sItemEffect_Zinc, + [ITEM_PP_MAX - ITEM_POTION] = sItemEffect_PPMax, + [ITEM_GUARD_SPEC - ITEM_POTION] = sItemEffect_GuardSpec, + [ITEM_DIRE_HIT - ITEM_POTION] = sItemEffect_DireHit, + [ITEM_X_ATTACK - ITEM_POTION] = sItemEffect_XAttack, + [ITEM_X_DEFEND - ITEM_POTION] = sItemEffect_XDefend, + [ITEM_X_SPEED - ITEM_POTION] = sItemEffect_XSpeed, + [ITEM_X_ACCURACY - ITEM_POTION] = sItemEffect_XAccuracy, + [ITEM_X_SPECIAL - ITEM_POTION] = sItemEffect_XSpecial, + [ITEM_SUN_STONE - ITEM_POTION] = sItemEffect_SunStone, + [ITEM_MOON_STONE - ITEM_POTION] = sItemEffect_MoonStone, + [ITEM_FIRE_STONE - ITEM_POTION] = sItemEffect_FireStone, + [ITEM_THUNDER_STONE - ITEM_POTION] = sItemEffect_ThunderStone, + [ITEM_WATER_STONE - ITEM_POTION] = sItemEffect_WaterStone, + [ITEM_LEAF_STONE - ITEM_POTION] = sItemEffect_LeafStone, + [ITEM_CHERI_BERRY - ITEM_POTION] = sItemEffect_CheriBerry, + [ITEM_CHESTO_BERRY - ITEM_POTION] = sItemEffect_ChestoBerry, + [ITEM_PECHA_BERRY - ITEM_POTION] = sItemEffect_PechaBerry, + [ITEM_RAWST_BERRY - ITEM_POTION] = sItemEffect_RawstBerry, + [ITEM_ASPEAR_BERRY - ITEM_POTION] = sItemEffect_AspearBerry, + [ITEM_LEPPA_BERRY - ITEM_POTION] = sItemEffect_LeppaBerry, + [ITEM_ORAN_BERRY - ITEM_POTION] = sItemEffect_OranBerry, + [ITEM_PERSIM_BERRY - ITEM_POTION] = sItemEffect_PersimBerry, + [ITEM_LUM_BERRY - ITEM_POTION] = sItemEffect_LumBerry, + [ITEM_SITRUS_BERRY - ITEM_POTION] = sItemEffect_SitrusBerry, [LAST_BERRY_INDEX - ITEM_POTION] = NULL, }; diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index 3ad9a97c6..1e3e347ca 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -3,8 +3,8 @@ // This table determines which TMs and HMs a species is capable of learning. // Each entry is a 64-bit bit array spread across two 32-bit values, with -// each bit corresponding to a . -const u32 gTMHMLearnsets[][2] = +// each bit corresponding to a machine. +static const u32 sTMHMLearnsets[][2] = { [SPECIES_NONE] = TMHM_LEARNSET(0), diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 4e285c06c..faf23bf31 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -1,156 +1,156 @@ -// TODO: document the indices for GCC extension +// TODO: document trainer pic indices with macro const u8 gFacilityClassToPicIndex[] = { - [0] = FACILITY_CLASS_AQUA_LEADER, - [1] = FACILITY_CLASS_TEAM_AQUA, - [2] = FACILITY_CLASS_TEAM_AQUA_2, - [3] = FACILITY_CLASS_AROMA_LADY, - [4] = FACILITY_CLASS_RUIN_MANIAC, - [5] = FACILITY_CLASS_INTERVIEWER, - [6] = FACILITY_CLASS_TUBER, - [7] = FACILITY_CLASS_TUBER_2, - [8] = FACILITY_CLASS_COOLTRAINER, - [9] = FACILITY_CLASS_COOLTRAINER_2, - [10] = FACILITY_CLASS_HEX_MANIAC, - [11] = FACILITY_CLASS_LADY, - [12] = FACILITY_CLASS_BEAUTY, - [13] = FACILITY_CLASS_RICH_BOY, - [14] = FACILITY_CLASS_POKEMANIAC, - [15] = FACILITY_CLASS_SWIMMER_MALE, - [16] = FACILITY_CLASS_BLACK_BELT, - [17] = FACILITY_CLASS_GUITARIST, - [18] = FACILITY_CLASS_KINDLER, - [19] = FACILITY_CLASS_CAMPER, - [20] = FACILITY_CLASS_BUG_MANIAC, - [21] = FACILITY_CLASS_PSYCHIC, - [22] = FACILITY_CLASS_PSYCHIC_2, - [23] = FACILITY_CLASS_GENTLEMAN, - [24] = FACILITY_CLASS_ELITE_FOUR, - [25] = FACILITY_CLASS_ELITE_FOUR_2, - [26] = FACILITY_CLASS_LEADER, - [27] = FACILITY_CLASS_LEADER_2, - [28] = FACILITY_CLASS_LEADER_3, - [29] = FACILITY_CLASS_SCHOOL_KID, - [30] = FACILITY_CLASS_SCHOOL_KID_2, - [31] = FACILITY_CLASS_SR_AND_JR, - [32] = FACILITY_CLASS_POKEFAN, - [33] = FACILITY_CLASS_POKEFAN_2, - [34] = FACILITY_CLASS_EXPERT, - [35] = FACILITY_CLASS_EXPERT_2, - [36] = FACILITY_CLASS_YOUNGSTER, - [37] = FACILITY_CLASS_CHAMPION, - [38] = FACILITY_CLASS_FISHERMAN, - [39] = FACILITY_CLASS_TRIATHLETE, - [40] = FACILITY_CLASS_TRIATHLETE_2, - [41] = FACILITY_CLASS_TRIATHLETE_3, - [42] = FACILITY_CLASS_TRIATHLETE_4, - [43] = FACILITY_CLASS_TRIATHLETE_5, - [44] = FACILITY_CLASS_TRIATHLETE_6, - [45] = FACILITY_CLASS_DRAGON_TAMER, - [46] = FACILITY_CLASS_BIRD_KEEPER, - [47] = FACILITY_CLASS_NINJA_BOY, - [48] = FACILITY_CLASS_BATTLE_GIRL, - [49] = FACILITY_CLASS_PARASOL_LADY, - [50] = FACILITY_CLASS_SWIMMER_FEMALE, - [51] = FACILITY_CLASS_PICNICKER, - [52] = FACILITY_CLASS_TWINS, - [53] = FACILITY_CLASS_SAILOR, - [54] = FACILITY_CLASS_YOUNGSTER, - [55] = FACILITY_CLASS_YOUNGSTER, - [56] = FACILITY_CLASS_BOARDER, - [57] = FACILITY_CLASS_BOARDER_2, - [58] = FACILITY_CLASS_COLLECTOR, - [59] = FACILITY_CLASS_COLLECTOR, - [60] = FACILITY_CLASS_COLLECTOR, - [61] = FACILITY_CLASS_PKMN_TRAINER, - [62] = FACILITY_CLASS_PKMN_TRAINER, - [63] = FACILITY_CLASS_PKMN_TRAINER, - [64] = FACILITY_CLASS_PKMN_TRAINER_2, - [65] = FACILITY_CLASS_PKMN_TRAINER_3, - [66] = FACILITY_CLASS_PKMN_TRAINER_4, - [67] = FACILITY_CLASS_PKMN_TRAINER_5, - [68] = FACILITY_CLASS_PKMN_TRAINER_6, - [69] = FACILITY_CLASS_PKMN_TRAINER_7, - [70] = FACILITY_CLASS_PKMN_BREEDER, - [71] = FACILITY_CLASS_PKMN_BREEDER_2, - [72] = FACILITY_CLASS_PKMN_RANGER, - [73] = FACILITY_CLASS_PKMN_RANGER_2, - [74] = FACILITY_CLASS_MAGMA_LEADER, - [75] = FACILITY_CLASS_TEAM_MAGMA, - [76] = FACILITY_CLASS_TEAM_MAGMA_2, - [77] = FACILITY_CLASS_LASS, - [78] = FACILITY_CLASS_BUG_CATCHER, - [79] = FACILITY_CLASS_HIKER, - [80] = FACILITY_CLASS_YOUNG_COUPLE, - [81] = FACILITY_CLASS_OLD_COUPLE, - [82] = FACILITY_CLASS_SIS_AND_BRO, - [83] = FACILITY_CLASS_AQUA_ADMIN, - [84] = FACILITY_CLASS_AQUA_ADMIN_2, - [85] = FACILITY_CLASS_MAGMA_ADMIN, - [86] = FACILITY_CLASS_MAGMA_ADMIN_2, - [87] = FACILITY_CLASS_LEADER_4, - [88] = FACILITY_CLASS_LEADER_5, - [89] = FACILITY_CLASS_LEADER_6, - [90] = FACILITY_CLASS_LEADER_7, - [91] = FACILITY_CLASS_LEADER_8, - [92] = FACILITY_CLASS_ELITE_FOUR_3, - [93] = FACILITY_CLASS_ELITE_FOUR_4, - [94] = FACILITY_CLASS_YOUNGSTER_2, - [95] = FACILITY_CLASS_BUG_CATCHER_2, - [96] = FACILITY_CLASS_LASS_2, - [97] = FACILITY_CLASS_SAILOR_2, - [98] = FACILITY_CLASS_CAMPER_2, - [99] = FACILITY_CLASS_PICNICKER_2, - [100] = FACILITY_CLASS_POKEMANIAC_2, - [101] = FACILITY_CLASS_SUPER_NERD, - [102] = FACILITY_CLASS_HIKER_2, - [103] = FACILITY_CLASS_BIKER, - [104] = FACILITY_CLASS_BURGLAR, - [105] = FACILITY_CLASS_ENGINEER, - [106] = FACILITY_CLASS_FISHERMAN_2, - [107] = FACILITY_CLASS_SWIMMER_MALE_2, - [108] = FACILITY_CLASS_CUE_BALL, - [109] = FACILITY_CLASS_GAMER, - [110] = FACILITY_CLASS_BEAUTY_2, - [111] = FACILITY_CLASS_SWIMMER_FEMALE_2, - [112] = FACILITY_CLASS_PSYCHIC_3, - [113] = FACILITY_CLASS_ROCKER, - [114] = FACILITY_CLASS_JUGGLER, - [115] = FACILITY_CLASS_TAMER, - [116] = FACILITY_CLASS_BIRD_KEEPER_2, - [117] = FACILITY_CLASS_BLACK_BELT_2, - [118] = FACILITY_CLASS_RIVAL, - [119] = FACILITY_CLASS_SCIENTIST, - [120] = FACILITY_CLASS_COOLTRAINER_3, - [121] = FACILITY_CLASS_COOLTRAINER_4, - [122] = FACILITY_CLASS_RIVAL_2, - [123] = FACILITY_CLASS_CHAMPION_2, - [124] = FACILITY_CLASS_CHANNELER, - [125] = FACILITY_CLASS_TWINS_2, - [126] = FACILITY_CLASS_COOL_COUPLE, - [127] = FACILITY_CLASS_YOUNG_COUPLE_2, - [128] = FACILITY_CLASS_CRUSH_KIN, - [129] = FACILITY_CLASS_SIS_AND_BRO_2, - [130] = FACILITY_CLASS_PKMN_PROF, - [131] = FACILITY_CLASS_PLAYER, - [132] = FACILITY_CLASS_PLAYER_2, - [133] = FACILITY_CLASS_PLAYER_3, - [134] = FACILITY_CLASS_PLAYER_4, - [135] = FACILITY_CLASS_TEAM_ROCKET_2, - [136] = FACILITY_CLASS_PSYCHIC_4, - [137] = FACILITY_CLASS_CRUSH_GIRL, - [138] = FACILITY_CLASS_TUBER_3, - [139] = FACILITY_CLASS_PKMN_BREEDER_3, - [140] = FACILITY_CLASS_PKMN_RANGER_3, - [141] = FACILITY_CLASS_PKMN_RANGER_4, - [142] = FACILITY_CLASS_AROMA_LADY_2, - [143] = FACILITY_CLASS_RUIN_MANIAC_2, - [144] = FACILITY_CLASS_LADY_2, - [145] = FACILITY_CLASS_PAINTER, - [146] = FACILITY_CLASS_ELITE_FOUR_7, - [147] = FACILITY_CLASS_RIVAL, - [148] = FACILITY_CLASS_SCIENTIST, - [149] = FACILITY_CLASS_CHANNELER, + [FACILITY_CLASS_AQUA_LEADER] = 0, + [FACILITY_CLASS_TEAM_AQUA] = 1, + [FACILITY_CLASS_TEAM_AQUA_2] = 2, + [FACILITY_CLASS_AROMA_LADY] = 3, + [FACILITY_CLASS_RUIN_MANIAC] = 4, + [FACILITY_CLASS_INTERVIEWER] = 5, + [FACILITY_CLASS_TUBER] = 6, + [FACILITY_CLASS_TUBER_2] = 7, + [FACILITY_CLASS_COOLTRAINER] = 8, + [FACILITY_CLASS_COOLTRAINER_2] = 9, + [FACILITY_CLASS_HEX_MANIAC] = 10, + [FACILITY_CLASS_LADY] = 11, + [FACILITY_CLASS_BEAUTY] = 12, + [FACILITY_CLASS_RICH_BOY] = 13, + [FACILITY_CLASS_POKEMANIAC] = 14, + [FACILITY_CLASS_SWIMMER_MALE] = 15, + [FACILITY_CLASS_BLACK_BELT] = 16, + [FACILITY_CLASS_GUITARIST] = 17, + [FACILITY_CLASS_KINDLER] = 18, + [FACILITY_CLASS_CAMPER] = 19, + [FACILITY_CLASS_BUG_MANIAC] = 20, + [FACILITY_CLASS_PSYCHIC] = 21, + [FACILITY_CLASS_PSYCHIC_2] = 22, + [FACILITY_CLASS_GENTLEMAN] = 23, + [FACILITY_CLASS_ELITE_FOUR] = 24, + [FACILITY_CLASS_ELITE_FOUR_2] = 25, + [FACILITY_CLASS_LEADER] = 26, + [FACILITY_CLASS_LEADER_2] = 27, + [FACILITY_CLASS_LEADER_3] = 28, + [FACILITY_CLASS_SCHOOL_KID] = 29, + [FACILITY_CLASS_SCHOOL_KID_2] = 30, + [FACILITY_CLASS_SR_AND_JR] = 31, + [FACILITY_CLASS_POKEFAN] = 32, + [FACILITY_CLASS_POKEFAN_2] = 33, + [FACILITY_CLASS_EXPERT] = 34, + [FACILITY_CLASS_EXPERT_2] = 35, + [FACILITY_CLASS_YOUNGSTER] = 36, + [FACILITY_CLASS_CHAMPION] = 37, + [FACILITY_CLASS_FISHERMAN] = 38, + [FACILITY_CLASS_TRIATHLETE] = 39, + [FACILITY_CLASS_TRIATHLETE_2] = 40, + [FACILITY_CLASS_TRIATHLETE_3] = 41, + [FACILITY_CLASS_TRIATHLETE_4] = 42, + [FACILITY_CLASS_TRIATHLETE_5] = 43, + [FACILITY_CLASS_TRIATHLETE_6] = 44, + [FACILITY_CLASS_DRAGON_TAMER] = 45, + [FACILITY_CLASS_BIRD_KEEPER] = 46, + [FACILITY_CLASS_NINJA_BOY] = 47, + [FACILITY_CLASS_BATTLE_GIRL] = 48, + [FACILITY_CLASS_PARASOL_LADY] = 49, + [FACILITY_CLASS_SWIMMER_FEMALE] = 50, + [FACILITY_CLASS_PICNICKER] = 51, + [FACILITY_CLASS_TWINS] = 52, + [FACILITY_CLASS_SAILOR] = 53, + [FACILITY_CLASS_BOARDER] = 36, + [FACILITY_CLASS_BOARDER_2] = 36, + [FACILITY_CLASS_COLLECTOR] = 54, + [FACILITY_CLASS_PKMN_TRAINER] = 55, + [FACILITY_CLASS_PKMN_TRAINER_2] = 56, + [FACILITY_CLASS_PKMN_TRAINER_3] = 56, + [FACILITY_CLASS_PKMN_TRAINER_4] = 56, + [FACILITY_CLASS_PKMN_TRAINER_5] = 57, + [FACILITY_CLASS_PKMN_TRAINER_6] = 57, + [FACILITY_CLASS_PKMN_TRAINER_7] = 57, + [FACILITY_CLASS_PKMN_BREEDER] = 58, + [FACILITY_CLASS_PKMN_BREEDER_2] = 59, + [FACILITY_CLASS_PKMN_RANGER] = 60, + [FACILITY_CLASS_PKMN_RANGER_2] = 61, + [FACILITY_CLASS_MAGMA_LEADER] = 62, + [FACILITY_CLASS_TEAM_MAGMA] = 63, + [FACILITY_CLASS_TEAM_MAGMA_2] = 64, + [FACILITY_CLASS_LASS] = 65, + [FACILITY_CLASS_BUG_CATCHER] = 66, + [FACILITY_CLASS_HIKER] = 67, + [FACILITY_CLASS_YOUNG_COUPLE] = 68, + [FACILITY_CLASS_OLD_COUPLE] = 69, + [FACILITY_CLASS_SIS_AND_BRO] = 70, + [FACILITY_CLASS_AQUA_ADMIN] = 71, + [FACILITY_CLASS_AQUA_ADMIN_2] = 72, + [FACILITY_CLASS_MAGMA_ADMIN] = 73, + [FACILITY_CLASS_MAGMA_ADMIN_2] = 74, + [FACILITY_CLASS_LEADER_4] = 75, + [FACILITY_CLASS_LEADER_5] = 76, + [FACILITY_CLASS_LEADER_6] = 77, + [FACILITY_CLASS_LEADER_7] = 78, + [FACILITY_CLASS_LEADER_8] = 79, + [FACILITY_CLASS_ELITE_FOUR_3] = 80, + [FACILITY_CLASS_ELITE_FOUR_4] = 81, + [FACILITY_CLASS_YOUNGSTER_2] = 82, + [FACILITY_CLASS_BUG_CATCHER_2] = 83, + [FACILITY_CLASS_LASS_2] = 84, + [FACILITY_CLASS_SAILOR_2] = 85, + [FACILITY_CLASS_CAMPER_2] = 86, + [FACILITY_CLASS_PICNICKER_2] = 87, + [FACILITY_CLASS_POKEMANIAC_2] = 88, + [FACILITY_CLASS_SUPER_NERD] = 89, + [FACILITY_CLASS_HIKER_2] = 90, + [FACILITY_CLASS_BIKER] = 91, + [FACILITY_CLASS_BURGLAR] = 92, + [FACILITY_CLASS_ENGINEER] = 93, + [FACILITY_CLASS_FISHERMAN_2] = 94, + [FACILITY_CLASS_SWIMMER_MALE_2] = 95, + [FACILITY_CLASS_CUE_BALL] = 96, + [FACILITY_CLASS_GAMER] = 97, + [FACILITY_CLASS_BEAUTY_2] = 98, + [FACILITY_CLASS_SWIMMER_FEMALE_2] = 99, + [FACILITY_CLASS_PSYCHIC_3] = 100, + [FACILITY_CLASS_ROCKER] = 101, + [FACILITY_CLASS_JUGGLER] = 102, + [FACILITY_CLASS_TAMER] = 103, + [FACILITY_CLASS_BIRD_KEEPER_2] = 104, + [FACILITY_CLASS_BLACK_BELT_2] = 105, + [FACILITY_CLASS_RIVAL] = 106, + [FACILITY_CLASS_SCIENTIST] = 107, + [FACILITY_CLASS_BOSS] = 108, + [FACILITY_CLASS_TEAM_ROCKET] = 109, + [FACILITY_CLASS_COOLTRAINER_3] = 110, + [FACILITY_CLASS_COOLTRAINER_4] = 111, + [FACILITY_CLASS_ELITE_FOUR_5] = 112, + [FACILITY_CLASS_ELITE_FOUR_6] = 113, + [FACILITY_CLASS_LEADER_9] = 116, + [FACILITY_CLASS_LEADER_10] = 117, + [FACILITY_CLASS_GENTLEMAN_2] = 123, + [FACILITY_CLASS_RIVAL_2] = 124, + [FACILITY_CLASS_CHAMPION_2] = 125, + [FACILITY_CLASS_CHANNELER] = 126, + [FACILITY_CLASS_TWINS_2] = 127, + [FACILITY_CLASS_COOL_COUPLE] = 128, + [FACILITY_CLASS_YOUNG_COUPLE_2] = 129, + [FACILITY_CLASS_CRUSH_KIN] = 130, + [FACILITY_CLASS_SIS_AND_BRO_2] = 131, + [FACILITY_CLASS_PKMN_PROF] = 132, + [FACILITY_CLASS_PLAYER] = 133, + [FACILITY_CLASS_PLAYER_2] = 134, + [FACILITY_CLASS_PLAYER_3] = 135, + [FACILITY_CLASS_PLAYER_4] = 136, + [FACILITY_CLASS_TEAM_ROCKET_2] = 137, + [FACILITY_CLASS_PSYCHIC_4] = 138, + [FACILITY_CLASS_CRUSH_GIRL] = 139, + [FACILITY_CLASS_TUBER_3] = 140, + [FACILITY_CLASS_PKMN_BREEDER_3] = 141, + [FACILITY_CLASS_PKMN_RANGER_3] = 142, + [FACILITY_CLASS_PKMN_RANGER_4] = 143, + [FACILITY_CLASS_AROMA_LADY_2] = 144, + [FACILITY_CLASS_RUIN_MANIAC_2] = 145, + [FACILITY_CLASS_LADY_2] = 146, + [FACILITY_CLASS_PAINTER] = 147, + [FACILITY_CLASS_ELITE_FOUR_7] = 112, + [FACILITY_CLASS_ELITE_FOUR_8] = 113, + [FACILITY_CLASS_CHAMPION_3] = 125, }; const u8 gFacilityClassToTrainerClass[] = |