diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_anim_80D51AC.c | 55 | ||||
| -rw-r--r-- | src/data/items.h | 768 | ||||
| -rw-r--r-- | src/item.c | 9 | ||||
| -rw-r--r-- | src/item_menu_icons.c | 68 |
4 files changed, 816 insertions, 84 deletions
diff --git a/src/battle_anim_80D51AC.c b/src/battle_anim_80D51AC.c index 25e07dc3a..6c1a2ad99 100644 --- a/src/battle_anim_80D51AC.c +++ b/src/battle_anim_80D51AC.c @@ -28,6 +28,61 @@ void sub_80D6308(u8 taskId); void sub_80D646C(u8 taskId); void sub_80A8B3C(u8 taskId); +const struct SpriteTemplate gHorizontalLungeSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = DoHorizontalLunge, +}; + +const struct SpriteTemplate gVerticalDipSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = DoVerticalDip, +}; + +const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SlideMonToOriginalPos, +}; + +const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SlideMonToOffset, +}; + +const struct SpriteTemplate gUnknown_0857FE88 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80D5B48, +}; + // Task to facilitate simple shaking of a pokemon's picture in battle. // The shaking alternates between the original position and the target position. // arg 0: anim battler diff --git a/src/data/items.h b/src/data/items.h index 2293bcfac..a36a13033 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1,5 +1,6 @@ const struct Item gItems[] = { + [ITEM_NONE] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -17,8 +18,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Pokeballs +// Pokeballs + [ITEM_MASTER_BALL] = { .name = _("MASTER BALL"), .itemId = ITEM_MASTER_BALL, @@ -35,6 +37,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 0, }, + + [ITEM_ULTRA_BALL] = { .name = _("ULTRA BALL"), .itemId = ITEM_ULTRA_BALL, @@ -51,6 +55,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 1, }, + + [ITEM_GREAT_BALL] = { .name = _("GREAT BALL"), .itemId = ITEM_GREAT_BALL, @@ -67,6 +73,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 2, }, + + [ITEM_POKE_BALL] = { .name = _("POKé BALL"), .itemId = ITEM_POKE_BALL, @@ -83,6 +91,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 3, }, + + [ITEM_SAFARI_BALL] = { .name = _("SAFARI BALL"), .itemId = ITEM_SAFARI_BALL, @@ -99,6 +109,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 4, }, + + [ITEM_NET_BALL] = { .name = _("NET BALL"), .itemId = ITEM_NET_BALL, @@ -115,6 +127,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 5, }, + + [ITEM_DIVE_BALL] = { .name = _("DIVE BALL"), .itemId = ITEM_DIVE_BALL, @@ -131,6 +145,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 6, }, + + [ITEM_NEST_BALL] = { .name = _("NEST BALL"), .itemId = ITEM_NEST_BALL, @@ -147,6 +163,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 7, }, + + [ITEM_REPEAT_BALL] = { .name = _("REPEAT BALL"), .itemId = ITEM_REPEAT_BALL, @@ -163,6 +181,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 8, }, + + [ITEM_TIMER_BALL] = { .name = _("TIMER BALL"), .itemId = ITEM_TIMER_BALL, @@ -179,6 +199,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 9, }, + + [ITEM_LUXURY_BALL] = { .name = _("LUXURY BALL"), .itemId = ITEM_LUXURY_BALL, @@ -195,6 +217,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 10, }, + + [ITEM_PREMIER_BALL] = { .name = _("PREMIER BALL"), .itemId = ITEM_PREMIER_BALL, @@ -212,8 +236,9 @@ const struct Item gItems[] = .secondaryId = 11, }, -//Medicine +// Medicine + [ITEM_POTION] = { .name = _("POTION"), .itemId = ITEM_POTION, @@ -230,6 +255,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ANTIDOTE] = { .name = _("ANTIDOTE"), .itemId = ITEM_ANTIDOTE, @@ -246,6 +273,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_BURN_HEAL] = { .name = _("BURN HEAL"), .itemId = ITEM_BURN_HEAL, @@ -262,6 +291,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ICE_HEAL] = { .name = _("ICE HEAL"), .itemId = ITEM_ICE_HEAL, @@ -278,6 +309,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_AWAKENING] = { .name = _("AWAKENING"), .itemId = ITEM_AWAKENING, @@ -294,6 +327,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_PARALYZE_HEAL] = { .name = _("PARLYZ HEAL"), .itemId = ITEM_PARALYZE_HEAL, @@ -310,6 +345,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_FULL_RESTORE] = { .name = _("FULL RESTORE"), .itemId = ITEM_FULL_RESTORE, @@ -326,6 +363,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_MAX_POTION] = { .name = _("MAX POTION"), .itemId = ITEM_MAX_POTION, @@ -342,6 +381,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_HYPER_POTION] = { .name = _("HYPER POTION"), .itemId = ITEM_HYPER_POTION, @@ -358,6 +399,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_SUPER_POTION] = { .name = _("SUPER POTION"), .itemId = ITEM_SUPER_POTION, @@ -374,6 +417,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_FULL_HEAL] = { .name = _("FULL HEAL"), .itemId = ITEM_FULL_HEAL, @@ -390,6 +435,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_REVIVE] = { .name = _("REVIVE"), .itemId = ITEM_REVIVE, @@ -406,6 +453,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_MAX_REVIVE] = { .name = _("MAX REVIVE"), .itemId = ITEM_MAX_REVIVE, @@ -422,6 +471,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_FRESH_WATER] = { .name = _("FRESH WATER"), .itemId = ITEM_FRESH_WATER, @@ -438,6 +489,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_SODA_POP] = { .name = _("SODA POP"), .itemId = ITEM_SODA_POP, @@ -454,6 +507,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_LEMONADE] = { .name = _("LEMONADE"), .itemId = ITEM_LEMONADE, @@ -470,6 +525,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_MOOMOO_MILK] = { .name = _("MOOMOO MILK"), .itemId = ITEM_MOOMOO_MILK, @@ -486,6 +543,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ENERGY_POWDER] = { .name = _("ENERGYPOWDER"), .itemId = ITEM_ENERGY_POWDER, @@ -502,6 +561,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ENERGY_ROOT] = { .name = _("ENERGY ROOT"), .itemId = ITEM_ENERGY_ROOT, @@ -518,6 +579,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_HEAL_POWDER] = { .name = _("HEAL POWDER"), .itemId = ITEM_HEAL_POWDER, @@ -534,6 +597,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_REVIVAL_HERB] = { .name = _("REVIVAL HERB"), .itemId = ITEM_REVIVAL_HERB, @@ -550,6 +615,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ETHER] = { .name = _("ETHER"), .itemId = ITEM_ETHER, @@ -566,6 +633,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_MAX_ETHER] = { .name = _("MAX ETHER"), .itemId = ITEM_MAX_ETHER, @@ -582,6 +651,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_ELIXIR] = { .name = _("ELIXIR"), .itemId = ITEM_ELIXIR, @@ -598,6 +669,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_MAX_ELIXIR] = { .name = _("MAX ELIXIR"), .itemId = ITEM_MAX_ELIXIR, @@ -614,6 +687,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_LAVA_COOKIE] = { .name = _("LAVA COOKIE"), .itemId = ITEM_LAVA_COOKIE, @@ -630,6 +705,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_BLUE_FLUTE] = { .name = _("BLUE FLUTE"), .itemId = ITEM_BLUE_FLUTE, @@ -646,6 +723,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_YELLOW_FLUTE] = { .name = _("YELLOW FLUTE"), .itemId = ITEM_YELLOW_FLUTE, @@ -662,6 +741,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_RED_FLUTE] = { .name = _("RED FLUTE"), .itemId = ITEM_RED_FLUTE, @@ -678,6 +759,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_BLACK_FLUTE] = { .name = _("BLACK FLUTE"), .itemId = ITEM_BLACK_FLUTE, @@ -694,6 +777,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WHITE_FLUTE] = { .name = _("WHITE FLUTE"), .itemId = ITEM_WHITE_FLUTE, @@ -710,6 +795,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BERRY_JUICE] = { .name = _("BERRY JUICE"), .itemId = ITEM_BERRY_JUICE, @@ -726,6 +813,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_SACRED_ASH] = { .name = _("SACRED ASH"), .itemId = ITEM_SACRED_ASH, @@ -743,8 +832,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Collectibles +// Collectibles + [ITEM_SHOAL_SALT] = { .name = _("SHOAL SALT"), .itemId = ITEM_SHOAL_SALT, @@ -761,6 +851,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SHOAL_SHELL] = { .name = _("SHOAL SHELL"), .itemId = ITEM_SHOAL_SHELL, @@ -777,6 +869,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RED_SHARD] = { .name = _("RED SHARD"), .itemId = ITEM_RED_SHARD, @@ -793,6 +887,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLUE_SHARD] = { .name = _("BLUE SHARD"), .itemId = ITEM_BLUE_SHARD, @@ -809,6 +905,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_YELLOW_SHARD] = { .name = _("YELLOW SHARD"), .itemId = ITEM_YELLOW_SHARD, @@ -825,6 +923,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GREEN_SHARD] = { .name = _("GREEN SHARD"), .itemId = ITEM_GREEN_SHARD, @@ -841,6 +941,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_034] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -857,6 +959,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_035] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -873,6 +977,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_036] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -889,6 +995,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_037] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -905,6 +1013,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_038] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -921,6 +1031,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_039] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -937,6 +1049,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03A] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -953,6 +1067,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03B] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -969,6 +1085,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03C] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -985,6 +1103,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03D] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1001,6 +1121,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03E] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1018,8 +1140,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Vitamins +// Vitamins + [ITEM_HP_UP] = { .name = _("HP UP"), .itemId = ITEM_HP_UP, @@ -1036,6 +1159,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PROTEIN] = { .name = _("PROTEIN"), .itemId = ITEM_PROTEIN, @@ -1052,6 +1177,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_IRON] = { .name = _("IRON"), .itemId = ITEM_IRON, @@ -1068,6 +1195,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CARBOS] = { .name = _("CARBOS"), .itemId = ITEM_CARBOS, @@ -1084,6 +1213,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CALCIUM] = { .name = _("CALCIUM"), .itemId = ITEM_CALCIUM, @@ -1100,6 +1231,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RARE_CANDY] = { .name = _("RARE CANDY"), .itemId = ITEM_RARE_CANDY, @@ -1116,6 +1249,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PP_UP] = { .name = _("PP UP"), .itemId = ITEM_PP_UP, @@ -1132,6 +1267,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ZINC] = { .name = _("ZINC"), .itemId = ITEM_ZINC, @@ -1148,6 +1285,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PP_MAX] = { .name = _("PP MAX"), .itemId = ITEM_PP_MAX, @@ -1164,6 +1303,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_048] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1181,8 +1322,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Battle items +// Battle items + [ITEM_GUARD_SPEC] = { .name = _("GUARD SPEC."), .itemId = ITEM_GUARD_SPEC, @@ -1199,6 +1341,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_DIRE_HIT] = { .name = _("DIRE HIT"), .itemId = ITEM_DIRE_HIT, @@ -1215,6 +1359,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_ATTACK] = { .name = _("X ATTACK"), .itemId = ITEM_X_ATTACK, @@ -1231,6 +1377,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_DEFEND] = { .name = _("X DEFEND"), .itemId = ITEM_X_DEFEND, @@ -1247,6 +1395,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_SPEED] = { .name = _("X SPEED"), .itemId = ITEM_X_SPEED, @@ -1263,6 +1413,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_ACCURACY] = { .name = _("X ACCURACY"), .itemId = ITEM_X_ACCURACY, @@ -1279,6 +1431,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_SPECIAL] = { .name = _("X SPECIAL"), .itemId = ITEM_X_SPECIAL, @@ -1295,6 +1449,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_POKE_DOLL] = { .name = _("POKé DOLL"), .itemId = ITEM_POKE_DOLL, @@ -1311,6 +1467,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Escape, .secondaryId = 0, }, + + [ITEM_FLUFFY_TAIL] = { .name = _("FLUFFY TAIL"), .itemId = ITEM_FLUFFY_TAIL, @@ -1327,6 +1485,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Escape, .secondaryId = 0, }, + + [ITEM_052] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1344,8 +1504,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Field items +// Field items + [ITEM_SUPER_REPEL] = { .name = _("SUPER REPEL"), .itemId = ITEM_SUPER_REPEL, @@ -1362,6 +1523,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MAX_REPEL] = { .name = _("MAX REPEL"), .itemId = ITEM_MAX_REPEL, @@ -1378,6 +1541,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ESCAPE_ROPE] = { .name = _("ESCAPE ROPE"), .itemId = ITEM_ESCAPE_ROPE, @@ -1394,6 +1559,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_REPEL] = { .name = _("REPEL"), .itemId = ITEM_REPEL, @@ -1410,6 +1577,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_057] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1426,6 +1595,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_058] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1442,6 +1613,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_059] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1458,6 +1631,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_05A] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1474,6 +1649,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_05B] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1490,6 +1667,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_05C] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1507,8 +1686,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Evolution stones +// Evolution stones + [ITEM_SUN_STONE] = { .name = _("SUN STONE"), .itemId = ITEM_SUN_STONE, @@ -1525,6 +1705,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MOON_STONE] = { .name = _("MOON STONE"), .itemId = ITEM_MOON_STONE, @@ -1541,6 +1723,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_FIRE_STONE] = { .name = _("FIRE STONE"), .itemId = ITEM_FIRE_STONE, @@ -1557,6 +1741,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_THUNDER_STONE] = { .name = _("THUNDERSTONE"), .itemId = ITEM_THUNDER_STONE, @@ -1573,6 +1759,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WATER_STONE] = { .name = _("WATER STONE"), .itemId = ITEM_WATER_STONE, @@ -1589,6 +1777,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LEAF_STONE] = { .name = _("LEAF STONE"), .itemId = ITEM_LEAF_STONE, @@ -1605,6 +1795,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_063] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1621,6 +1813,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_064] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1637,6 +1831,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_065] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1653,6 +1849,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_066] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1670,8 +1868,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Valuable items +// Valuable items + [ITEM_TINY_MUSHROOM] = { .name = _("TINYMUSHROOM"), .itemId = ITEM_TINY_MUSHROOM, @@ -1688,6 +1887,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BIG_MUSHROOM] = { .name = _("BIG MUSHROOM"), .itemId = ITEM_BIG_MUSHROOM, @@ -1704,6 +1905,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_069] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1720,6 +1923,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PEARL] = { .name = _("PEARL"), .itemId = ITEM_PEARL, @@ -1736,6 +1941,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BIG_PEARL] = { .name = _("BIG PEARL"), .itemId = ITEM_BIG_PEARL, @@ -1752,6 +1959,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STARDUST] = { .name = _("STARDUST"), .itemId = ITEM_STARDUST, @@ -1768,6 +1977,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STAR_PIECE] = { .name = _("STAR PIECE"), .itemId = ITEM_STAR_PIECE, @@ -1784,6 +1995,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_NUGGET] = { .name = _("NUGGET"), .itemId = ITEM_NUGGET, @@ -1800,6 +2013,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HEART_SCALE] = { .name = _("HEART SCALE"), .itemId = ITEM_HEART_SCALE, @@ -1816,6 +2031,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_070] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1832,6 +2049,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_071] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1848,6 +2067,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_072] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1864,6 +2085,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_073] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1880,6 +2103,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_074] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1896,6 +2121,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_075] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1912,6 +2139,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_076] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1928,6 +2157,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_077] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1944,6 +2175,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_078] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1961,7 +2194,8 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Mail +// Mail + [ITEM_ORANGE_MAIL] = { .name = _("ORANGE MAIL"), .itemId = ITEM_ORANGE_MAIL, @@ -1978,6 +2212,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HARBOR_MAIL] = { .name = _("HARBOR MAIL"), .itemId = ITEM_HARBOR_MAIL, @@ -1994,6 +2230,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 1, }, + + [ITEM_GLITTER_MAIL] = { .name = _("GLITTER MAIL"), .itemId = ITEM_GLITTER_MAIL, @@ -2010,6 +2248,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 2, }, + + [ITEM_MECH_MAIL] = { .name = _("MECH MAIL"), .itemId = ITEM_MECH_MAIL, @@ -2026,6 +2266,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 3, }, + + [ITEM_WOOD_MAIL] = { .name = _("WOOD MAIL"), .itemId = ITEM_WOOD_MAIL, @@ -2042,6 +2284,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 4, }, + + [ITEM_WAVE_MAIL] = { .name = _("WAVE MAIL"), .itemId = ITEM_WAVE_MAIL, @@ -2058,6 +2302,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 5, }, + + [ITEM_BEAD_MAIL] = { .name = _("BEAD MAIL"), .itemId = ITEM_BEAD_MAIL, @@ -2074,6 +2320,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 6, }, + + [ITEM_SHADOW_MAIL] = { .name = _("SHADOW MAIL"), .itemId = ITEM_SHADOW_MAIL, @@ -2090,6 +2338,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 7, }, + + [ITEM_TROPIC_MAIL] = { .name = _("TROPIC MAIL"), .itemId = ITEM_TROPIC_MAIL, @@ -2106,6 +2356,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 8, }, + + [ITEM_DREAM_MAIL] = { .name = _("DREAM MAIL"), .itemId = ITEM_DREAM_MAIL, @@ -2122,6 +2374,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 9, }, + + [ITEM_FAB_MAIL] = { .name = _("FAB MAIL"), .itemId = ITEM_FAB_MAIL, @@ -2138,6 +2392,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 10, }, + + [ITEM_RETRO_MAIL] = { .name = _("RETRO MAIL"), .itemId = ITEM_RETRO_MAIL, @@ -2155,8 +2411,9 @@ const struct Item gItems[] = .secondaryId = 11, }, -//Berries +// Berries + [ITEM_CHERI_BERRY] = { .name = _("CHERI BERRY"), .itemId = ITEM_CHERI_BERRY, @@ -2173,6 +2430,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_CHESTO_BERRY] = { .name = _("CHESTO BERRY"), .itemId = ITEM_CHESTO_BERRY, @@ -2189,6 +2448,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_PECHA_BERRY] = { .name = _("PECHA BERRY"), .itemId = ITEM_PECHA_BERRY, @@ -2205,6 +2466,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_RAWST_BERRY] = { .name = _("RAWST BERRY"), .itemId = ITEM_RAWST_BERRY, @@ -2221,6 +2484,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ASPEAR_BERRY] = { .name = _("ASPEAR BERRY"), .itemId = ITEM_ASPEAR_BERRY, @@ -2237,6 +2502,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_LEPPA_BERRY] = { .name = _("LEPPA BERRY"), .itemId = ITEM_LEPPA_BERRY, @@ -2253,6 +2520,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_ORAN_BERRY] = { .name = _("ORAN BERRY"), .itemId = ITEM_ORAN_BERRY, @@ -2269,6 +2538,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_PERSIM_BERRY] = { .name = _("PERSIM BERRY"), .itemId = ITEM_PERSIM_BERRY, @@ -2285,6 +2556,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_LUM_BERRY] = { .name = _("LUM BERRY"), .itemId = ITEM_LUM_BERRY, @@ -2301,6 +2574,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_SITRUS_BERRY] = { .name = _("SITRUS BERRY"), .itemId = ITEM_SITRUS_BERRY, @@ -2317,6 +2592,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_FIGY_BERRY] = { .name = _("FIGY BERRY"), .itemId = ITEM_FIGY_BERRY, @@ -2333,6 +2610,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WIKI_BERRY] = { .name = _("WIKI BERRY"), .itemId = ITEM_WIKI_BERRY, @@ -2349,6 +2628,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MAGO_BERRY] = { .name = _("MAGO BERRY"), .itemId = ITEM_MAGO_BERRY, @@ -2365,6 +2646,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_AGUAV_BERRY] = { .name = _("AGUAV BERRY"), .itemId = ITEM_AGUAV_BERRY, @@ -2381,6 +2664,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_IAPAPA_BERRY] = { .name = _("IAPAPA BERRY"), .itemId = ITEM_IAPAPA_BERRY, @@ -2397,6 +2682,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RAZZ_BERRY] = { .name = _("RAZZ BERRY"), .itemId = ITEM_RAZZ_BERRY, @@ -2413,6 +2700,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLUK_BERRY] = { .name = _("BLUK BERRY"), .itemId = ITEM_BLUK_BERRY, @@ -2429,6 +2718,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_NANAB_BERRY] = { .name = _("NANAB BERRY"), .itemId = ITEM_NANAB_BERRY, @@ -2445,6 +2736,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WEPEAR_BERRY] = { .name = _("WEPEAR BERRY"), .itemId = ITEM_WEPEAR_BERRY, @@ -2461,6 +2754,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PINAP_BERRY] = { .name = _("PINAP BERRY"), .itemId = ITEM_PINAP_BERRY, @@ -2477,6 +2772,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_POMEG_BERRY] = { .name = _("POMEG BERRY"), .itemId = ITEM_POMEG_BERRY, @@ -2493,6 +2790,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_KELPSY_BERRY] = { .name = _("KELPSY BERRY"), .itemId = ITEM_KELPSY_BERRY, @@ -2509,6 +2808,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_QUALOT_BERRY] = { .name = _("QUALOT BERRY"), .itemId = ITEM_QUALOT_BERRY, @@ -2525,6 +2826,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HONDEW_BERRY] = { .name = _("HONDEW BERRY"), .itemId = ITEM_HONDEW_BERRY, @@ -2541,6 +2844,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GREPA_BERRY] = { .name = _("GREPA BERRY"), .itemId = ITEM_GREPA_BERRY, @@ -2557,6 +2862,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TAMATO_BERRY] = { .name = _("TAMATO BERRY"), .itemId = ITEM_TAMATO_BERRY, @@ -2573,6 +2880,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CORNN_BERRY] = { .name = _("CORNN BERRY"), .itemId = ITEM_CORNN_BERRY, @@ -2589,6 +2898,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MAGOST_BERRY] = { .name = _("MAGOST BERRY"), .itemId = ITEM_MAGOST_BERRY, @@ -2605,6 +2916,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RABUTA_BERRY] = { .name = _("RABUTA BERRY"), .itemId = ITEM_RABUTA_BERRY, @@ -2621,6 +2934,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_NOMEL_BERRY] = { .name = _("NOMEL BERRY"), .itemId = ITEM_NOMEL_BERRY, @@ -2637,6 +2952,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SPELON_BERRY] = { .name = _("SPELON BERRY"), .itemId = ITEM_SPELON_BERRY, @@ -2653,6 +2970,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PAMTRE_BERRY] = { .name = _("PAMTRE BERRY"), .itemId = ITEM_PAMTRE_BERRY, @@ -2669,6 +2988,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WATMEL_BERRY] = { .name = _("WATMEL BERRY"), .itemId = ITEM_WATMEL_BERRY, @@ -2685,6 +3006,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DURIN_BERRY] = { .name = _("DURIN BERRY"), .itemId = ITEM_DURIN_BERRY, @@ -2701,6 +3024,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BELUE_BERRY] = { .name = _("BELUE BERRY"), .itemId = ITEM_BELUE_BERRY, @@ -2717,6 +3042,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LIECHI_BERRY] = { .name = _("LIECHI BERRY"), .itemId = ITEM_LIECHI_BERRY, @@ -2733,6 +3060,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GANLON_BERRY] = { .name = _("GANLON BERRY"), .itemId = ITEM_GANLON_BERRY, @@ -2749,6 +3078,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SALAC_BERRY] = { .name = _("SALAC BERRY"), .itemId = ITEM_SALAC_BERRY, @@ -2765,6 +3096,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PETAYA_BERRY] = { .name = _("PETAYA BERRY"), .itemId = ITEM_PETAYA_BERRY, @@ -2781,6 +3114,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_APICOT_BERRY] = { .name = _("APICOT BERRY"), .itemId = ITEM_APICOT_BERRY, @@ -2797,6 +3132,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LANSAT_BERRY] = { .name = _("LANSAT BERRY"), .itemId = ITEM_LANSAT_BERRY, @@ -2813,6 +3150,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STARF_BERRY] = { .name = _("STARF BERRY"), .itemId = ITEM_STARF_BERRY, @@ -2829,6 +3168,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ENIGMA_BERRY] = { .name = _("ENIGMA BERRY"), .itemId = ITEM_ENIGMA_BERRY, @@ -2845,6 +3186,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_EnigmaBerry, .secondaryId = 0, }, + + [ITEM_0B0] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -2861,6 +3204,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0B1] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -2877,6 +3222,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0B2] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -2894,8 +3241,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Hold items +// Hold items + [ITEM_BRIGHT_POWDER] = { .name = _("BRIGHTPOWDER"), .itemId = ITEM_BRIGHT_POWDER, @@ -2912,6 +3260,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WHITE_HERB] = { .name = _("WHITE HERB"), .itemId = ITEM_WHITE_HERB, @@ -2928,6 +3278,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MACHO_BRACE] = { .name = _("MACHO BRACE"), .itemId = ITEM_MACHO_BRACE, @@ -2944,6 +3296,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_EXP_SHARE] = { .name = _("EXP. SHARE"), .itemId = ITEM_EXP_SHARE, @@ -2960,6 +3314,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_QUICK_CLAW] = { .name = _("QUICK CLAW"), .itemId = ITEM_QUICK_CLAW, @@ -2976,6 +3332,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SOOTHE_BELL] = { .name = _("SOOTHE BELL"), .itemId = ITEM_SOOTHE_BELL, @@ -2992,6 +3350,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MENTAL_HERB] = { .name = _("MENTAL HERB"), .itemId = ITEM_MENTAL_HERB, @@ -3008,6 +3368,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CHOICE_BAND] = { .name = _("CHOICE BAND"), .itemId = ITEM_CHOICE_BAND, @@ -3024,6 +3386,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_KINGS_ROCK] = { .name = _("KING’S ROCK"), .itemId = ITEM_KINGS_ROCK, @@ -3040,6 +3404,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SILVER_POWDER] = { .name = _("SILVERPOWDER"), .itemId = ITEM_SILVER_POWDER, @@ -3056,6 +3422,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_AMULET_COIN] = { .name = _("AMULET COIN"), .itemId = ITEM_AMULET_COIN, @@ -3072,6 +3440,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CLEANSE_TAG] = { .name = _("CLEANSE TAG"), .itemId = ITEM_CLEANSE_TAG, @@ -3088,6 +3458,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SOUL_DEW] = { .name = _("SOUL DEW"), .itemId = ITEM_SOUL_DEW, @@ -3104,6 +3476,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DEEP_SEA_TOOTH] = { .name = _("DEEPSEATOOTH"), .itemId = ITEM_DEEP_SEA_TOOTH, @@ -3120,6 +3494,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DEEP_SEA_SCALE] = { .name = _("DEEPSEASCALE"), .itemId = ITEM_DEEP_SEA_SCALE, @@ -3136,6 +3512,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SMOKE_BALL] = { .name = _("SMOKE BALL"), .itemId = ITEM_SMOKE_BALL, @@ -3152,6 +3530,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_EVERSTONE] = { .name = _("EVERSTONE"), .itemId = ITEM_EVERSTONE, @@ -3168,6 +3548,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_FOCUS_BAND] = { .name = _("FOCUS BAND"), .itemId = ITEM_FOCUS_BAND, @@ -3184,6 +3566,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LUCKY_EGG] = { .name = _("LUCKY EGG"), .itemId = ITEM_LUCKY_EGG, @@ -3200,6 +3584,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SCOPE_LENS] = { .name = _("SCOPE LENS"), .itemId = ITEM_SCOPE_LENS, @@ -3216,6 +3602,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_METAL_COAT] = { .name = _("METAL COAT"), .itemId = ITEM_METAL_COAT, @@ -3232,6 +3620,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LEFTOVERS] = { .name = _("LEFTOVERS"), .itemId = ITEM_LEFTOVERS, @@ -3248,6 +3638,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DRAGON_SCALE] = { .name = _("DRAGON SCALE"), .itemId = ITEM_DRAGON_SCALE, @@ -3264,6 +3656,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LIGHT_BALL] = { .name = _("LIGHT BALL"), .itemId = ITEM_LIGHT_BALL, @@ -3280,6 +3674,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SOFT_SAND] = { .name = _("SOFT SAND"), .itemId = ITEM_SOFT_SAND, @@ -3296,6 +3692,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HARD_STONE] = { .name = _("HARD STONE"), .itemId = ITEM_HARD_STONE, @@ -3312,6 +3710,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MIRACLE_SEED] = { .name = _("MIRACLE SEED"), .itemId = ITEM_MIRACLE_SEED, @@ -3328,6 +3728,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLACK_GLASSES] = { .name = _("BLACKGLASSES"), .itemId = ITEM_BLACK_GLASSES, @@ -3344,6 +3746,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLACK_BELT] = { .name = _("BLACK BELT"), .itemId = ITEM_BLACK_BELT, @@ -3360,6 +3764,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MAGNET] = { .name = _("MAGNET"), .itemId = ITEM_MAGNET, @@ -3376,6 +3782,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MYSTIC_WATER] = { .name = _("MYSTIC WATER"), .itemId = ITEM_MYSTIC_WATER, @@ -3392,6 +3800,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SHARP_BEAK] = { .name = _("SHARP BEAK"), .itemId = ITEM_SHARP_BEAK, @@ -3408,6 +3818,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_POISON_BARB] = { .name = _("POISON BARB"), .itemId = ITEM_POISON_BARB, @@ -3424,6 +3836,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_NEVER_MELT_ICE] = { .name = _("NEVERMELTICE"), .itemId = ITEM_NEVER_MELT_ICE, @@ -3440,6 +3854,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SPELL_TAG] = { .name = _("SPELL TAG"), .itemId = ITEM_SPELL_TAG, @@ -3456,6 +3872,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TWISTED_SPOON] = { .name = _("TWISTEDSPOON"), .itemId = ITEM_TWISTED_SPOON, @@ -3472,6 +3890,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CHARCOAL] = { .name = _("CHARCOAL"), .itemId = ITEM_CHARCOAL, @@ -3488,6 +3908,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DRAGON_FANG] = { .name = _("DRAGON FANG"), .itemId = ITEM_DRAGON_FANG, @@ -3504,6 +3926,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SILK_SCARF] = { .name = _("SILK SCARF"), .itemId = ITEM_SILK_SCARF, @@ -3520,6 +3944,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_UP_GRADE] = { .name = _("UP-GRADE"), .itemId = ITEM_UP_GRADE, @@ -3536,6 +3962,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SHELL_BELL] = { .name = _("SHELL BELL"), .itemId = ITEM_SHELL_BELL, @@ -3552,6 +3980,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SEA_INCENSE] = { .name = _("SEA INCENSE"), .itemId = ITEM_SEA_INCENSE, @@ -3568,6 +3998,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LAX_INCENSE] = { .name = _("LAX INCENSE"), .itemId = ITEM_LAX_INCENSE, @@ -3584,6 +4016,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LUCKY_PUNCH] = { .name = _("LUCKY PUNCH"), .itemId = ITEM_LUCKY_PUNCH, @@ -3600,6 +4034,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_METAL_POWDER] = { .name = _("METAL POWDER"), .itemId = ITEM_METAL_POWDER, @@ -3616,6 +4052,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_THICK_CLUB] = { .name = _("THICK CLUB"), .itemId = ITEM_THICK_CLUB, @@ -3632,6 +4070,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STICK] = { .name = _("STICK"), .itemId = ITEM_STICK, @@ -3648,6 +4088,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E2] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3664,6 +4106,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E3] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3680,6 +4124,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E4] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3696,6 +4142,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E5] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3712,6 +4160,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E6] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3728,6 +4178,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E7] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3744,6 +4196,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E8] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3760,6 +4214,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E9] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3776,6 +4232,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EA] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3792,6 +4250,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EB] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3808,6 +4268,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EC] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3824,6 +4286,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0ED] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3840,6 +4304,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EE] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3856,6 +4322,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EF] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3872,6 +4340,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F0] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3888,6 +4358,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F1] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3904,6 +4376,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F2] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3920,6 +4394,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F3] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3936,6 +4412,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F4] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3952,6 +4430,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F5] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3968,6 +4448,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F6] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3984,6 +4466,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F7] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4000,6 +4484,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F8] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4016,6 +4502,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F9] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4032,6 +4520,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0FA] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4048,6 +4538,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0FB] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4064,6 +4556,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0FC] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4080,6 +4574,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0FD] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4096,6 +4592,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RED_SCARF] = { .name = _("RED SCARF"), .itemId = ITEM_RED_SCARF, @@ -4112,6 +4610,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLUE_SCARF] = { .name = _("BLUE SCARF"), .itemId = ITEM_BLUE_SCARF, @@ -4128,6 +4628,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PINK_SCARF] = { .name = _("PINK SCARF"), .itemId = ITEM_PINK_SCARF, @@ -4144,6 +4646,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GREEN_SCARF] = { .name = _("GREEN SCARF"), .itemId = ITEM_GREEN_SCARF, @@ -4160,6 +4664,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_YELLOW_SCARF] = { .name = _("YELLOW SCARF"), .itemId = ITEM_YELLOW_SCARF, @@ -4177,8 +4683,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Key items +// Key items + [ITEM_MACH_BIKE] = { .name = _("MACH BIKE"), .itemId = ITEM_MACH_BIKE, @@ -4195,6 +4702,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_COIN_CASE] = { .name = _("COIN CASE"), .itemId = ITEM_COIN_CASE, @@ -4211,6 +4720,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ITEMFINDER] = { .name = _("ITEMFINDER"), .itemId = ITEM_ITEMFINDER, @@ -4227,6 +4738,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_OLD_ROD] = { .name = _("OLD ROD"), .itemId = ITEM_OLD_ROD, @@ -4243,6 +4756,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GOOD_ROD] = { .name = _("GOOD ROD"), .itemId = ITEM_GOOD_ROD, @@ -4259,6 +4774,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 1, }, + + [ITEM_SUPER_ROD] = { .name = _("SUPER ROD"), .itemId = ITEM_SUPER_ROD, @@ -4275,6 +4792,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 2, }, + + [ITEM_SS_TICKET] = { .name = _("S.S. TICKET"), .itemId = ITEM_SS_TICKET, @@ -4291,6 +4810,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CONTEST_PASS] = { .name = _("CONTEST PASS"), .itemId = ITEM_CONTEST_PASS, @@ -4307,6 +4828,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_10B] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4323,6 +4846,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WAILMER_PAIL] = { .name = _("WAILMER PAIL"), .itemId = ITEM_WAILMER_PAIL, @@ -4339,6 +4864,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DEVON_GOODS] = { .name = _("DEVON GOODS"), .itemId = ITEM_DEVON_GOODS, @@ -4355,6 +4882,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SOOT_SACK] = { .name = _("SOOT SACK"), .itemId = ITEM_SOOT_SACK, @@ -4371,6 +4900,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BASEMENT_KEY] = { .name = _("BASEMENT KEY"), .itemId = ITEM_BASEMENT_KEY, @@ -4387,6 +4918,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ACRO_BIKE] = { .name = _("ACRO BIKE"), .itemId = ITEM_ACRO_BIKE, @@ -4403,6 +4936,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 1, }, + + [ITEM_POKEBLOCK_CASE] = { .name = _("{POKEBLOCK} CASE"), .itemId = ITEM_POKEBLOCK_CASE, @@ -4419,6 +4954,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LETTER] = { .name = _("LETTER"), .itemId = ITEM_LETTER, @@ -4435,6 +4972,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_EON_TICKET] = { .name = _("EON TICKET"), .itemId = ITEM_EON_TICKET, @@ -4451,6 +4990,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 1, }, + + [ITEM_RED_ORB] = { .name = _("RED ORB"), .itemId = ITEM_RED_ORB, @@ -4467,6 +5008,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLUE_ORB] = { .name = _("BLUE ORB"), .itemId = ITEM_BLUE_ORB, @@ -4483,6 +5026,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SCANNER] = { .name = _("SCANNER"), .itemId = ITEM_SCANNER, @@ -4499,6 +5044,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GO_GOGGLES] = { .name = _("GO-GOGGLES"), .itemId = ITEM_GO_GOGGLES, @@ -4515,6 +5062,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_METEORITE] = { .name = _("METEORITE"), .itemId = ITEM_METEORITE, @@ -4531,6 +5080,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOM_1_KEY] = { .name = _("RM. 1 KEY"), .itemId = ITEM_ROOM_1_KEY, @@ -4547,6 +5098,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOM_2_KEY] = { .name = _("RM. 2 KEY"), .itemId = ITEM_ROOM_2_KEY, @@ -4563,6 +5116,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOM_4_KEY] = { .name = _("RM. 4 KEY"), .itemId = ITEM_ROOM_4_KEY, @@ -4579,6 +5134,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOM_6_KEY] = { .name = _("RM. 6 KEY"), .itemId = ITEM_ROOM_6_KEY, @@ -4595,6 +5152,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STORAGE_KEY] = { .name = _("STORAGE KEY"), .itemId = ITEM_STORAGE_KEY, @@ -4611,6 +5170,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOT_FOSSIL] = { .name = _("ROOT FOSSIL"), .itemId = ITEM_ROOT_FOSSIL, @@ -4627,6 +5188,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CLAW_FOSSIL] = { .name = _("CLAW FOSSIL"), .itemId = ITEM_CLAW_FOSSIL, @@ -4643,6 +5206,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DEVON_SCOPE] = { .name = _("DEVON SCOPE"), .itemId = ITEM_DEVON_SCOPE, @@ -4660,8 +5225,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//TMs/HMs +// TMs/HMs + [ITEM_TM01_FOCUS_PUNCH] = { .name = _("TM01"), .itemId = ITEM_TM01_FOCUS_PUNCH, @@ -4678,6 +5244,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM02_DRAGON_CLAW] = { .name = _("TM02"), .itemId = ITEM_TM02_DRAGON_CLAW, @@ -4694,6 +5262,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM03_WATER_PULSE] = { .name = _("TM03"), .itemId = ITEM_TM03_WATER_PULSE, @@ -4710,6 +5280,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM04_CALM_MIND] = { .name = _("TM04"), .itemId = ITEM_TM04_CALM_MIND, @@ -4726,6 +5298,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM05_ROAR] = { .name = _("TM05"), .itemId = ITEM_TM05_ROAR, @@ -4742,6 +5316,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM06_TOXIC] = { .name = _("TM06"), .itemId = ITEM_TM06_TOXIC, @@ -4758,6 +5334,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM07_HAIL] = { .name = _("TM07"), .itemId = ITEM_TM07_HAIL, @@ -4774,6 +5352,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM08_BULK_UP] = { .name = _("TM08"), .itemId = ITEM_TM08_BULK_UP, @@ -4790,6 +5370,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM09_BULLET_SEED] = { .name = _("TM09"), .itemId = ITEM_TM09_BULLET_SEED, @@ -4806,6 +5388,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM10_HIDDEN_POWER] = { .name = _("TM10"), .itemId = ITEM_TM10_HIDDEN_POWER, @@ -4822,6 +5406,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM11_SUNNY_DAY] = { .name = _("TM11"), .itemId = ITEM_TM11_SUNNY_DAY, @@ -4838,6 +5424,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM12_TAUNT] = { .name = _("TM12"), .itemId = ITEM_TM12_TAUNT, @@ -4854,6 +5442,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM13_ICE_BEAM] = { .name = _("TM13"), .itemId = ITEM_TM13_ICE_BEAM, @@ -4870,6 +5460,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM14_BLIZZARD] = { .name = _("TM14"), .itemId = ITEM_TM14_BLIZZARD, @@ -4886,6 +5478,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM15_HYPER_BEAM] = { .name = _("TM15"), .itemId = ITEM_TM15_HYPER_BEAM, @@ -4902,6 +5496,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM16_LIGHT_SCREEN] = { .name = _("TM16"), .itemId = ITEM_TM16_LIGHT_SCREEN, @@ -4918,6 +5514,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM17_PROTECT] = { .name = _("TM17"), .itemId = ITEM_TM17_PROTECT, @@ -4934,6 +5532,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM18_RAIN_DANCE] = { .name = _("TM18"), .itemId = ITEM_TM18_RAIN_DANCE, @@ -4950,6 +5550,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM19_GIGA_DRAIN] = { .name = _("TM19"), .itemId = ITEM_TM19_GIGA_DRAIN, @@ -4966,6 +5568,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM20_SAFEGUARD] = { .name = _("TM20"), .itemId = ITEM_TM20_SAFEGUARD, @@ -4982,6 +5586,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM21_FRUSTRATION] = { .name = _("TM21"), .itemId = ITEM_TM21_FRUSTRATION, @@ -4998,6 +5604,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM22_SOLARBEAM] = { .name = _("TM22"), .itemId = ITEM_TM22_SOLARBEAM, @@ -5014,6 +5622,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM23_IRON_TAIL] = { .name = _("TM23"), .itemId = ITEM_TM23_IRON_TAIL, @@ -5030,6 +5640,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM24_THUNDERBOLT] = { .name = _("TM24"), .itemId = ITEM_TM24_THUNDERBOLT, @@ -5046,6 +5658,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM25_THUNDER] = { .name = _("TM25"), .itemId = ITEM_TM25_THUNDER, @@ -5062,6 +5676,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM26_EARTHQUAKE] = { .name = _("TM26"), .itemId = ITEM_TM26_EARTHQUAKE, @@ -5078,6 +5694,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM27_RETURN] = { .name = _("TM27"), .itemId = ITEM_TM27_RETURN, @@ -5094,6 +5712,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM28_DIG] = { .name = _("TM28"), .itemId = ITEM_TM28_DIG, @@ -5110,6 +5730,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM29_PSYCHIC] = { .name = _("TM29"), .itemId = ITEM_TM29_PSYCHIC, @@ -5126,6 +5748,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM30_SHADOW_BALL] = { .name = _("TM30"), .itemId = ITEM_TM30_SHADOW_BALL, @@ -5142,6 +5766,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM31_BRICK_BREAK] = { .name = _("TM31"), .itemId = ITEM_TM31_BRICK_BREAK, @@ -5158,6 +5784,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM32_DOUBLE_TEAM] = { .name = _("TM32"), .itemId = ITEM_TM32_DOUBLE_TEAM, @@ -5174,6 +5802,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM33_REFLECT] = { .name = _("TM33"), .itemId = ITEM_TM33_REFLECT, @@ -5190,6 +5820,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM34_SHOCK_WAVE] = { .name = _("TM34"), .itemId = ITEM_TM34_SHOCK_WAVE, @@ -5206,6 +5838,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM35_FLAMETHROWER] = { .name = _("TM35"), .itemId = ITEM_TM35_FLAMETHROWER, @@ -5222,6 +5856,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM36_SLUDGE_BOMB] = { .name = _("TM36"), .itemId = ITEM_TM36_SLUDGE_BOMB, @@ -5238,6 +5874,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM37_SANDSTORM] = { .name = _("TM37"), .itemId = ITEM_TM37_SANDSTORM, @@ -5254,6 +5892,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM38_FIRE_BLAST] = { .name = _("TM38"), .itemId = ITEM_TM38_FIRE_BLAST, @@ -5270,6 +5910,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM39_ROCK_TOMB] = { .name = _("TM39"), .itemId = ITEM_TM39_ROCK_TOMB, @@ -5286,6 +5928,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM40_AERIAL_ACE] = { .name = _("TM40"), .itemId = ITEM_TM40_AERIAL_ACE, @@ -5302,6 +5946,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM41_TORMENT] = { .name = _("TM41"), .itemId = ITEM_TM41_TORMENT, @@ -5318,6 +5964,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM42_FACADE] = { .name = _("TM42"), .itemId = ITEM_TM42_FACADE, @@ -5334,6 +5982,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM43_SECRET_POWER] = { .name = _("TM43"), .itemId = ITEM_TM43_SECRET_POWER, @@ -5350,6 +6000,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM44_REST] = { .name = _("TM44"), .itemId = ITEM_TM44_REST, @@ -5366,6 +6018,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM45_ATTRACT] = { .name = _("TM45"), .itemId = ITEM_TM45_ATTRACT, @@ -5382,6 +6036,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM46_THIEF] = { .name = _("TM46"), .itemId = ITEM_TM46_THIEF, @@ -5398,6 +6054,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM47_STEEL_WING] = { .name = _("TM47"), .itemId = ITEM_TM47_STEEL_WING, @@ -5414,6 +6072,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM48_SKILL_SWAP] = { .name = _("TM48"), .itemId = ITEM_TM48_SKILL_SWAP, @@ -5430,6 +6090,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM49_SNATCH] = { .name = _("TM49"), .itemId = ITEM_TM49_SNATCH, @@ -5446,6 +6108,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM50_OVERHEAT] = { .name = _("TM50"), .itemId = ITEM_TM50_OVERHEAT, @@ -5462,6 +6126,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM01_CUT] = { .name = _("HM01"), .itemId = ITEM_HM01_CUT, @@ -5478,6 +6144,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM02_FLY] = { .name = _("HM02"), .itemId = ITEM_HM02_FLY, @@ -5494,6 +6162,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM03_SURF] = { .name = _("HM03"), .itemId = ITEM_HM03_SURF, @@ -5510,6 +6180,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM04_STRENGTH] = { .name = _("HM04"), .itemId = ITEM_HM04_STRENGTH, @@ -5526,6 +6198,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM05_FLASH] = { .name = _("HM05"), .itemId = ITEM_HM05_FLASH, @@ -5542,6 +6216,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM06_ROCK_SMASH] = { .name = _("HM06"), .itemId = ITEM_HM06_ROCK_SMASH, @@ -5558,6 +6234,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM07_WATERFALL] = { .name = _("HM07"), .itemId = ITEM_HM07_WATERFALL, @@ -5574,6 +6252,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM08_DIVE] = { .name = _("HM08"), .itemId = ITEM_HM08_DIVE, @@ -5590,6 +6270,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_15B] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -5606,6 +6288,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_15C] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -5623,8 +6307,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//FireRed/LeafGreen key items +// FireRed/LeafGreen key items + [ITEM_OAKS_PARCEL] = { .name = _("OAK’S PARCEL"), .itemId = ITEM_OAKS_PARCEL, @@ -5641,6 +6326,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_POKE_FLUTE] = { .name = _("POKé FLUTE"), .itemId = ITEM_POKE_FLUTE, @@ -5657,6 +6344,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SECRET_KEY] = { .name = _("SECRET KEY"), .itemId = ITEM_SECRET_KEY, @@ -5673,6 +6362,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BIKE_VOUCHER] = { .name = _("BIKE VOUCHER"), .itemId = ITEM_BIKE_VOUCHER, @@ -5689,6 +6380,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GOLD_TEETH] = { .name = _("GOLD TEETH"), .itemId = ITEM_GOLD_TEETH, @@ -5705,6 +6398,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_OLD_AMBER] = { .name = _("OLD AMBER"), .itemId = ITEM_OLD_AMBER, @@ -5721,6 +6416,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CARD_KEY] = { .name = _("CARD KEY"), .itemId = ITEM_CARD_KEY, @@ -5737,6 +6434,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LIFT_KEY] = { .name = _("LIFT KEY"), .itemId = ITEM_LIFT_KEY, @@ -5753,6 +6452,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HELIX_FOSSIL] = { .name = _("HELIX FOSSIL"), .itemId = ITEM_HELIX_FOSSIL, @@ -5769,6 +6470,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DOME_FOSSIL] = { .name = _("DOME FOSSIL"), .itemId = ITEM_DOME_FOSSIL, @@ -5785,6 +6488,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SILPH_SCOPE] = { .name = _("SILPH SCOPE"), .itemId = ITEM_SILPH_SCOPE, @@ -5801,6 +6506,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BICYCLE] = { .name = _("BICYCLE"), .itemId = ITEM_BICYCLE, @@ -5817,6 +6524,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TOWN_MAP] = { .name = _("TOWN MAP"), .itemId = ITEM_TOWN_MAP, @@ -5833,6 +6542,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_VS_SEEKER] = { .name = _("VS SEEKER"), .itemId = ITEM_VS_SEEKER, @@ -5849,6 +6560,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_FAME_CHECKER] = { .name = _("FAME CHECKER"), .itemId = ITEM_FAME_CHECKER, @@ -5865,6 +6578,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM_CASE] = { .name = _("TM CASE"), .itemId = ITEM_TM_CASE, @@ -5881,6 +6596,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BERRY_POUCH] = { .name = _("BERRY POUCH"), .itemId = ITEM_BERRY_POUCH, @@ -5897,6 +6614,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TEACHY_TV] = { .name = _("TEACHY TV"), .itemId = ITEM_TEACHY_TV, @@ -5913,6 +6632,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TRI_PASS] = { .name = _("TRI-PASS"), .itemId = ITEM_TRI_PASS, @@ -5929,6 +6650,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RAINBOW_PASS] = { .name = _("RAINBOW PASS"), .itemId = ITEM_RAINBOW_PASS, @@ -5945,6 +6668,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TEA] = { .name = _("TEA"), .itemId = ITEM_TEA, @@ -5961,6 +6686,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MYSTIC_TICKET] = { .name = _("MYSTICTICKET"), .itemId = ITEM_MYSTIC_TICKET, @@ -5977,6 +6704,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_AURORA_TICKET] = { .name = _("AURORATICKET"), .itemId = ITEM_AURORA_TICKET, @@ -5993,6 +6722,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_POWDER_JAR] = { .name = _("POWDER JAR"), .itemId = ITEM_POWDER_JAR, @@ -6009,6 +6740,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RUBY] = { .name = _("RUBY"), .itemId = ITEM_RUBY, @@ -6025,6 +6758,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SAPPHIRE] = { .name = _("SAPPHIRE"), .itemId = ITEM_SAPPHIRE, @@ -6042,8 +6777,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Emerald-specific key items +// Emerald-specific key items + [ITEM_MAGMA_EMBLEM] = { .name = _("MAGMA EMBLEM"), .itemId = ITEM_MAGMA_EMBLEM, @@ -6060,6 +6796,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_OLD_SEA_MAP] = { .name = _("OLD SEA MAP"), .itemId = ITEM_OLD_SEA_MAP, diff --git a/src/item.c b/src/item.c index b2c009be6..6d2dbd561 100644 --- a/src/item.c +++ b/src/item.c @@ -1,7 +1,6 @@ #include "global.h" #include "item.h" #include "berry.h" -#include "constants/items.h" #include "string_util.h" #include "text.h" #include "event_data.h" @@ -10,11 +9,13 @@ #include "item_menu.h" #include "strings.h" #include "load_save.h" +#include "item_use.h" #include "battle_pyramid.h" #include "battle_pyramid_bag.h" +#include "constants/items.h" +#include "constants/hold_effects.h" extern u16 gUnknown_0203CF30[]; -extern const struct Item gItems[]; // this file's functions static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); @@ -23,6 +24,10 @@ static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count); // EWRAM variables EWRAM_DATA struct BagPocket gBagPockets[POCKETS_COUNT] = {0}; +// rodata +#include "data/text/item_descriptions.h" +#include "data/items.h" + // code static u16 GetBagItemQuantity(u16 *quantity) { diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 23dbd51eb..85b42b9b3 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -8,10 +8,8 @@ #include "menu_helpers.h" #include "berry.h" #include "graphics.h" -#include "constants/items.h" #include "item.h" -#include "item_use.h" -#include "constants/hold_effects.h" +#include "constants/items.h" struct CompressedTilesPal { @@ -19,12 +17,6 @@ struct CompressedTilesPal const u32 *pal; }; -extern void DoHorizontalLunge(struct Sprite *sprite); -extern void DoVerticalDip(struct Sprite *sprite); -extern void SlideMonToOriginalPos(struct Sprite *sprite); -extern void SlideMonToOffset(struct Sprite *sprite); -extern void sub_80D5B48(struct Sprite *sprite); - // this file's functions static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite); static void SpriteCB_ShakeBagVisual(struct Sprite *sprite); @@ -414,64 +406,6 @@ static const struct SpriteTemplate gUnknown_0857FE10 = .callback = SpriteCallbackDummy, }; -const struct SpriteTemplate gHorizontalLungeSpriteTemplate = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = DoHorizontalLunge, -}; - -const struct SpriteTemplate gVerticalDipSpriteTemplate = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = DoVerticalDip, -}; - -const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SlideMonToOriginalPos, -}; - -const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SlideMonToOffset, -}; - -const struct SpriteTemplate gUnknown_0857FE88 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80D5B48, -}; - -#include "data/text/item_descriptions.h" -#include "data/items.h" - // code void RemoveBagSprite(u8 id) { |