ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restored FRLG items

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-11-11 22:26:58 -03:00
parent 6f728f2fa1
commit ae26a7529c
6 changed files with 410 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
include/constants/items.h
View File

@ -885,35 +885,52 @@
#define ITEM_TOWN_MAP 715
#define ITEM_VS_SEEKER 716
#define ITEM_TM_CASE 717
#define ITEM_POKEMON_BOX_LINK 718
#define ITEM_COIN_CASE 719
#define ITEM_POWDER_JAR 720
#define ITEM_WAILMER_PAIL 721
#define ITEM_POKE_RADAR 722
#define ITEM_POKEBLOCK_CASE 723
#define ITEM_SOOT_SACK 724
#define ITEM_BERRY_POUCH 718
#define ITEM_POKEMON_BOX_LINK 719
#define ITEM_COIN_CASE 720
#define ITEM_POWDER_JAR 721
#define ITEM_WAILMER_PAIL 722
#define ITEM_POKE_RADAR 723
#define ITEM_POKEBLOCK_CASE 724
#define ITEM_SOOT_SACK 725
#define ITEM_POKE_FLUTE 726
#define ITEM_FAME_CHECKER 727
#define ITEM_TEACHY_TV 728
// Story Key Items
#define ITEM_SS_TICKET 725
#define ITEM_EON_TICKET 726
#define ITEM_MYSTIC_TICKET 727
#define ITEM_AURORA_TICKET 728
#define ITEM_OLD_SEA_MAP 729
#define ITEM_LETTER 730
#define ITEM_DEVON_PARTS 731
#define ITEM_GO_GOGGLES 732
#define ITEM_DEVON_SCOPE 733
#define ITEM_BASEMENT_KEY 734
#define ITEM_SCANNER 735
#define ITEM_STORAGE_KEY 736
#define ITEM_KEY_TO_ROOM_1 737
#define ITEM_KEY_TO_ROOM_2 738
#define ITEM_KEY_TO_ROOM_4 739
#define ITEM_KEY_TO_ROOM_6 740
#define ITEM_METEORITE 741
#define ITEM_MAGMA_EMBLEM 742
#define ITEM_SS_TICKET 729
#define ITEM_EON_TICKET 730
#define ITEM_MYSTIC_TICKET 731
#define ITEM_AURORA_TICKET 732
#define ITEM_OLD_SEA_MAP 733
#define ITEM_LETTER 734
#define ITEM_DEVON_PARTS 735
#define ITEM_GO_GOGGLES 736
#define ITEM_DEVON_SCOPE 737
#define ITEM_BASEMENT_KEY 738
#define ITEM_SCANNER 739
#define ITEM_STORAGE_KEY 740
#define ITEM_KEY_TO_ROOM_1 741
#define ITEM_KEY_TO_ROOM_2 742
#define ITEM_KEY_TO_ROOM_4 743
#define ITEM_KEY_TO_ROOM_6 744
#define ITEM_METEORITE 745
#define ITEM_MAGMA_EMBLEM 746
#define ITEM_CONTEST_PASS 747
#define ITEM_OAKS_PARCEL 748
#define ITEM_SECRET_KEY 749
#define ITEM_BIKE_VOUCHER 750
#define ITEM_GOLD_TEETH 751
#define ITEM_CARD_KEY 752
#define ITEM_LIFT_KEY 753
#define ITEM_SILPH_SCOPE 754
#define ITEM_TRI_PASS 755
#define ITEM_RAINBOW_PASS 756
#define ITEM_TEA 757
#define ITEM_RUBY 758
#define ITEM_SAPPHIRE 759
#define ITEMS_COUNT 743
#define ITEMS_COUNT 760
#define ITEM_FIELD_ARROW ITEMS_COUNT
// Range of berries given out by various NPCS

33
include/graphics.h
View File

@ -4631,6 +4631,8 @@ extern const u32 gItemIcon_VsSeeker[];
extern const u32 gItemIconPalette_VsSeeker[];
extern const u32 gItemIcon_TMCase[];
extern const u32 gItemIconPalette_TMCase[];
extern const u32 gItemIcon_BerryPouch[];
extern const u32 gItemIconPalette_BerryPouch[];
//extern const u32 gItemIcon_PokemonBoxLink[];
//extern const u32 gItemIconPalette_PokemonBoxLink[];
extern const u32 gItemIcon_CoinCase[];
@ -4645,6 +4647,12 @@ extern const u32 gItemIcon_PokeblockCase[];
extern const u32 gItemIconPalette_PokeblockCase[];
extern const u32 gItemIcon_SootSack[];
extern const u32 gItemIconPalette_SootSack[];
extern const u32 gItemIcon_PokeFlute[];
extern const u32 gItemIconPalette_PokeFlute[];
extern const u32 gItemIcon_FameChecker[];
extern const u32 gItemIconPalette_FameChecker[];
extern const u32 gItemIcon_TeachyTV[];
extern const u32 gItemIconPalette_TeachyTV[];
// Story Key Items
extern const u32 gItemIcon_SSTicket[];
extern const u32 gItemIconPalette_SSTicket[];
@ -4677,6 +4685,31 @@ extern const u32 gItemIcon_Meteorite[];
extern const u32 gItemIconPalette_Meteorite[];
extern const u32 gItemIcon_MagmaEmblem[];
extern const u32 gItemIconPalette_MagmaEmblem[];
extern const u32 gItemIcon_ContestPass[];
extern const u32 gItemIconPalette_ContestPass[];
extern const u32 gItemIcon_OaksParcel[];
extern const u32 gItemIconPalette_OaksParcel[];
extern const u32 gItemIcon_SecretKey[];
extern const u32 gItemIconPalette_SecretKey[];
extern const u32 gItemIcon_BikeVoucher[];
extern const u32 gItemIconPalette_BikeVoucher[];
extern const u32 gItemIcon_GoldTeeth[];
extern const u32 gItemIconPalette_GoldTeeth[];
extern const u32 gItemIcon_CardKey[];
extern const u32 gItemIconPalette_CardKey[];
extern const u32 gItemIcon_LiftKey[];
extern const u32 gItemIconPalette_Key[];
extern const u32 gItemIcon_SilphScope[];
extern const u32 gItemIconPalette_SilphScope[];
extern const u32 gItemIcon_TriPass[];
extern const u32 gItemIconPalette_TriPass[];
extern const u32 gItemIcon_RainbowPass[];
extern const u32 gItemIconPalette_RainbowPass[];
extern const u32 gItemIcon_Tea[];
extern const u32 gItemIconPalette_Tea[];
extern const u32 gItemIcon_Gem[];
extern const u32 gItemIconPalette_Ruby[];
extern const u32 gItemIconPalette_Sapphire[];
extern const u32 gItemIcon_ReturnToFieldArrow[];
extern const u32 gItemIconPalette_ReturnToFieldArrow[];

46
src/data/graphics/items.h
View File

@ -1923,6 +1923,9 @@ const u32 gItemIconPalette_VsSeeker[] = INCBIN_U32("graphics/items/icon_palettes
const u32 gItemIcon_TMCase[] = INCBIN_U32("graphics/items/icons/tm_case.4bpp.lz");
const u32 gItemIconPalette_TMCase[] = INCBIN_U32("graphics/items/icon_palettes/tm_case.gbapal.lz");
const u32 gItemIcon_BerryPouch[] = INCBIN_U32("graphics/items/icons/berry_pouch.4bpp.lz");
const u32 gItemIconPalette_BerryPouch[] = INCBIN_U32("graphics/items/icon_palettes/berry_pouch.gbapal.lz");
//const u32 gItemIcon_PokemonBoxLink[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz");
//const u32 gItemIconPalette_PokemonBoxLink[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz");
@ -1944,6 +1947,15 @@ const u32 gItemIconPalette_PokeblockCase[] = INCBIN_U32("graphics/items/icon_pal
const u32 gItemIcon_SootSack[] = INCBIN_U32("graphics/items/icons/soot_sack.4bpp.lz");
const u32 gItemIconPalette_SootSack[] = INCBIN_U32("graphics/items/icon_palettes/soot_sack.gbapal.lz");
const u32 gItemIcon_PokeFlute[] = INCBIN_U32("graphics/items/icons/poke_flute.4bpp.lz");
const u32 gItemIconPalette_PokeFlute[] = INCBIN_U32("graphics/items/icon_palettes/poke_flute.gbapal.lz");
const u32 gItemIcon_FameChecker[] = INCBIN_U32("graphics/items/icons/fame_checker.4bpp.lz");
const u32 gItemIconPalette_FameChecker[] = INCBIN_U32("graphics/items/icon_palettes/fame_checker.gbapal.lz");
const u32 gItemIcon_TeachyTV[] = INCBIN_U32("graphics/items/icons/teachy_tv.4bpp.lz");
const u32 gItemIconPalette_TeachyTV[] = INCBIN_U32("graphics/items/icon_palettes/teachy_tv.gbapal.lz");
// Story Key Items
const u32 gItemIcon_SSTicket[] = INCBIN_U32("graphics/items/icons/ss_ticket.4bpp.lz");
@ -1981,7 +1993,6 @@ const u32 gItemIconPalette_Scanner[] = INCBIN_U32("graphics/items/icon_palettes/
const u32 gItemIcon_StorageKey[] = INCBIN_U32("graphics/items/icons/storage_key.4bpp.lz");
const u32 gItemIcon_KeyToRoom1[] = INCBIN_U32("graphics/items/icons/key_to_room_1.4bpp.lz");
const u32 gItemIconPalette_Key[] = INCBIN_U32("graphics/items/icon_palettes/key.gbapal.lz");
const u32 gItemIcon_KeyToRoom2[] = INCBIN_U32("graphics/items/icons/key_to_room_2.4bpp.lz");
@ -1995,16 +2006,12 @@ const u32 gItemIconPalette_Meteorite[] = INCBIN_U32("graphics/items/icon_palette
const u32 gItemIcon_MagmaEmblem[] = INCBIN_U32("graphics/items/icons/magma_emblem.4bpp.lz");
const u32 gItemIconPalette_MagmaEmblem[] = INCBIN_U32("graphics/items/icon_palettes/magma_emblem.gbapal.lz");
// Remove these
/*const u32 gItemIcon_ContestPass[] = INCBIN_U32("graphics/items/icons/contest_pass.4bpp.lz");
const u32 gItemIcon_ContestPass[] = INCBIN_U32("graphics/items/icons/contest_pass.4bpp.lz");
const u32 gItemIconPalette_ContestPass[] = INCBIN_U32("graphics/items/icon_palettes/contest_pass.gbapal.lz");
const u32 gItemIcon_OaksParcel[] = INCBIN_U32("graphics/items/icons/oaks_parcel.4bpp.lz");
const u32 gItemIconPalette_OaksParcel[] = INCBIN_U32("graphics/items/icon_palettes/oaks_parcel.gbapal.lz");
const u32 gItemIcon_PokeFlute[] = INCBIN_U32("graphics/items/icons/poke_flute.4bpp.lz");
const u32 gItemIconPalette_PokeFlute[] = INCBIN_U32("graphics/items/icon_palettes/poke_flute.gbapal.lz");
const u32 gItemIcon_SecretKey[] = INCBIN_U32("graphics/items/icons/secret_key.4bpp.lz");
const u32 gItemIconPalette_SecretKey[] = INCBIN_U32("graphics/items/icon_palettes/secret_key.gbapal.lz");
@ -2018,28 +2025,11 @@ const u32 gItemIcon_CardKey[] = INCBIN_U32("graphics/items/icons/card_key.4bpp.l
const u32 gItemIconPalette_CardKey[] = INCBIN_U32("graphics/items/icon_palettes/card_key.gbapal.lz");
const u32 gItemIcon_LiftKey[] = INCBIN_U32("graphics/items/icons/lift_key.4bpp.lz");
const u32 gItemIconPalette_Key[] = INCBIN_U32("graphics/items/icon_palettes/key.gbapal.lz");
const u32 gItemIcon_SilphScope[] = INCBIN_U32("graphics/items/icons/silph_scope.4bpp.lz");
const u32 gItemIconPalette_SilphScope[] = INCBIN_U32("graphics/items/icon_palettes/silph_scope.gbapal.lz");
const u32 gItemIcon_Bicycle[] = INCBIN_U32("graphics/items/icons/bicycle.4bpp.lz");
const u32 gItemIconPalette_Bicycle[] = INCBIN_U32("graphics/items/icon_palettes/bicycle.gbapal.lz");
const u32 gItemIcon_VSSeeker[] = INCBIN_U32("graphics/items/icons/vs_seeker.4bpp.lz");
const u32 gItemIconPalette_VSSeeker[] = INCBIN_U32("graphics/items/icon_palettes/vs_seeker.gbapal.lz");
const u32 gItemIcon_FameChecker[] = INCBIN_U32("graphics/items/icons/fame_checker.4bpp.lz");
const u32 gItemIconPalette_FameChecker[] = INCBIN_U32("graphics/items/icon_palettes/fame_checker.gbapal.lz");
const u32 gItemIcon_TMCase[] = INCBIN_U32("graphics/items/icons/tm_case.4bpp.lz");
const u32 gItemIconPalette_TMCase[] = INCBIN_U32("graphics/items/icon_palettes/tm_case.gbapal.lz");
const u32 gItemIcon_BerryPouch[] = INCBIN_U32("graphics/items/icons/berry_pouch.4bpp.lz");
const u32 gItemIconPalette_BerryPouch[] = INCBIN_U32("graphics/items/icon_palettes/berry_pouch.gbapal.lz");
const u32 gItemIcon_TeachyTV[] = INCBIN_U32("graphics/items/icons/teachy_tv.4bpp.lz");
const u32 gItemIconPalette_TeachyTV[] = INCBIN_U32("graphics/items/icon_palettes/teachy_tv.gbapal.lz");
const u32 gItemIcon_TriPass[] = INCBIN_U32("graphics/items/icons/tri_pass.4bpp.lz");
const u32 gItemIconPalette_TriPass[] = INCBIN_U32("graphics/items/icon_palettes/tri_pass.gbapal.lz");
@ -2049,7 +2039,11 @@ const u32 gItemIconPalette_RainbowPass[] = INCBIN_U32("graphics/items/icon_palet
const u32 gItemIcon_Tea[] = INCBIN_U32("graphics/items/icons/tea.4bpp.lz");
const u32 gItemIconPalette_Tea[] = INCBIN_U32("graphics/items/icon_palettes/tea.gbapal.lz");
const u32 gItemIcon_Gem[] = INCBIN_U32("graphics/items/icons/gem.4bpp.lz");
const u32 gItemIconPalette_Ruby[] = INCBIN_U32("graphics/items/icon_palettes/ruby.gbapal.lz");
const u32 gItemIcon_Gem[] = INCBIN_U32("graphics/items/icons/gem.4bpp.lz");
const u32 gItemIconPalette_Sapphire[] = INCBIN_U32("graphics/items/icon_palettes/sapphire.gbapal.lz");
const u32 gItemIconPalette_Sapphire[] = INCBIN_U32("graphics/items/icon_palettes/sapphire.gbapal.lz");*/
// Remove these
/*const u32 gItemIcon_ContestPass[] = INCBIN_U32("graphics/items/icons/contest_pass.4bpp.lz");
const u32 gItemIconPalette_ContestPass[] = INCBIN_U32("graphics/items/icon_palettes/contest_pass.gbapal.lz");
*/

17
src/data/item_icon_table.h
View File

@ -764,6 +764,7 @@ const u32 *const gItemIconTable[][2] =
[ITEM_TOWN_MAP] = {gItemIcon_TownMap, gItemIconPalette_TownMap},
[ITEM_VS_SEEKER] = {gItemIcon_VsSeeker, gItemIconPalette_VsSeeker},
[ITEM_TM_CASE] = {gItemIcon_TMCase, gItemIconPalette_TMCase},
[ITEM_BERRY_POUCH] = {gItemIcon_BerryPouch, gItemIconPalette_BerryPouch},
[ITEM_POKEMON_BOX_LINK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo
[ITEM_COIN_CASE] = {gItemIcon_CoinCase, gItemIconPalette_CoinCase},
[ITEM_POWDER_JAR] = {gItemIcon_PowderJar, gItemIconPalette_PowderJar},
@ -771,6 +772,9 @@ const u32 *const gItemIconTable[][2] =
[ITEM_POKE_RADAR] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo
[ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase},
[ITEM_SOOT_SACK] = {gItemIcon_SootSack, gItemIconPalette_SootSack},
[ITEM_POKE_FLUTE] = {gItemIcon_PokeFlute, gItemIconPalette_PokeFlute},
[ITEM_FAME_CHECKER] = {gItemIcon_FameChecker, gItemIconPalette_FameChecker},
[ITEM_TEACHY_TV] = {gItemIcon_TeachyTV, gItemIconPalette_TeachyTV},
// Story Key Items
[ITEM_SS_TICKET] = {gItemIcon_SSTicket, gItemIconPalette_SSTicket},
[ITEM_EON_TICKET] = {gItemIcon_EonTicket, gItemIconPalette_EonTicket},
@ -790,6 +794,19 @@ const u32 *const gItemIconTable[][2] =
[ITEM_KEY_TO_ROOM_6] = {gItemIcon_KeyToRoom6, gItemIconPalette_Key},
[ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite},
[ITEM_MAGMA_EMBLEM] = {gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem},
[ITEM_CONTEST_PASS] = {gItemIcon_ContestPass, gItemIconPalette_ContestPass},
[ITEM_OAKS_PARCEL] = {gItemIcon_OaksParcel, gItemIconPalette_OaksParcel},
[ITEM_SECRET_KEY] = {gItemIcon_SecretKey, gItemIconPalette_SecretKey},
[ITEM_BIKE_VOUCHER] = {gItemIcon_BikeVoucher, gItemIconPalette_BikeVoucher},
[ITEM_GOLD_TEETH] = {gItemIcon_GoldTeeth, gItemIconPalette_GoldTeeth},
[ITEM_CARD_KEY] = {gItemIcon_CardKey, gItemIconPalette_CardKey},
[ITEM_LIFT_KEY] = {gItemIcon_LiftKey, gItemIconPalette_Key},
[ITEM_SILPH_SCOPE] = {gItemIcon_SilphScope, gItemIconPalette_SilphScope},
[ITEM_TRI_PASS] = {gItemIcon_TriPass, gItemIconPalette_TriPass},
[ITEM_RAINBOW_PASS] = {gItemIcon_RainbowPass, gItemIconPalette_RainbowPass},
[ITEM_TEA] = {gItemIcon_Tea, gItemIconPalette_Tea},
[ITEM_RUBY] = {gItemIcon_Gem, gItemIconPalette_Ruby},
[ITEM_SAPPHIRE] = {gItemIcon_Gem, gItemIconPalette_Sapphire},
// Return to field arrow
[ITEM_FIELD_ARROW] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
};

212
src/data/items.h
View File

@ -8850,6 +8850,19 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_BERRY_POUCH] =
{
.name = _("Berry Pouch"),
.itemId = ITEM_BERRY_POUCH,
.price = 0,
.description = sBerryPouchDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_POKEMON_BOX_LINK] = // Todo
{
.name = _("????????"),
@ -8934,6 +8947,44 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_POKE_FLUTE] =
{
.name = _("Poké Flute"),
.itemId = ITEM_POKE_FLUTE,
.price = 0,
.description = sPokeFluteDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_FAME_CHECKER] =
{
.name = _("FAME CHECKER"),
.itemId = ITEM_FAME_CHECKER,
.price = 0,
.description = sFameCheckerDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_TEACHY_TV] =
{
.name = _("TEACHY TV"),
.itemId = ITEM_TEACHY_TV,
.price = 0,
.description = sTeachyTVDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
// Story Key Items
[ITEM_SS_TICKET] =
@ -9156,4 +9207,165 @@ const struct Item gItems[] =
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_CONTEST_PASS] =
{
.name = _("CONTEST PASS"),
.itemId = ITEM_CONTEST_PASS,
.price = 0,
.description = sContestPassDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_OAKS_PARCEL] =
{
.name = _("OAK'S PARCEL"),
.itemId = ITEM_OAKS_PARCEL,
.price = 0,
.description = sOaksParcelDesc,
.importance = 2,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_SECRET_KEY] =
{
.name = _("SECRET KEY"),
.itemId = ITEM_SECRET_KEY,
.price = 0,
.description = sSecretKeyDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_BIKE_VOUCHER] =
{
.name = _("BIKE VOUCHER"),
.itemId = ITEM_BIKE_VOUCHER,
.price = 0,
.description = sBikeVoucherDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_GOLD_TEETH] =
{
.name = _("GOLD TEETH"),
.itemId = ITEM_GOLD_TEETH,
.price = 0,
.description = sGoldTeethDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_CARD_KEY] =
{
.name = _("CARD KEY"),
.itemId = ITEM_CARD_KEY,
.price = 0,
.description = sCardKeyDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_LIFT_KEY] =
{
.name = _("LIFT KEY"),
.itemId = ITEM_LIFT_KEY,
.price = 0,
.description = sLiftKeyDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_SILPH_SCOPE] =
{
.name = _("SILPH SCOPE"),
.itemId = ITEM_SILPH_SCOPE,
.price = 0,
.description = sSilphScopeDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_TRI_PASS] =
{
.name = _("TRI-PASS"),
.itemId = ITEM_TRI_PASS,
.price = 0,
.description = sTriPassDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_RAINBOW_PASS] =
{
.name = _("RAINBOW PASS"),
.itemId = ITEM_RAINBOW_PASS,
.price = 0,
.description = sRainbowPassDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_TEA] =
{
.name = _("TEA"),
.itemId = ITEM_TEA,
.price = 0,
.description = sTeaDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_RUBY] =
{
.name = _("RUBY"),
.itemId = ITEM_RUBY,
.price = 0,
.description = sRubyDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_SAPPHIRE] =
{
.name = _("SAPPHIRE"),
.itemId = ITEM_SAPPHIRE,
.price = 0,
.description = sSapphireDesc,
.importance = 1,
.unk19 = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
};

85
src/data/text/item_descriptions.h
View File

@ -3304,6 +3304,11 @@ static const u8 sTMCaseDesc[] = _(
"that holds TMs and\n"
"HMs.");
static const u8 sBerryPouchDesc[] = _(
"A convenient\n"
"container that\n"
"holds Berries.");
static const u8 sPokemonBoxLinkDesc[] = _( // Todo
"?????");
@ -3334,6 +3339,21 @@ static const u8 sSootSackDesc[] = _(
"gather and hold\n"
"volcanic ash.");
static const u8 sPokeFluteDesc[] = _(
"A sweet-sounding\n"
"flute that awakens\n"
"Pokémon.");
static const u8 sFameCheckerDesc[] = _(
"Stores information\n"
"on famous people\n"
"for instant recall.");
static const u8 sTeachyTVDesc[] = _(
"A TV set tuned to\n"
"an advice program\n"
"for Trainers.");
// Story Key Items
static const u8 sSSTicketDesc[] = _(
"The ticket required\n"
@ -3423,3 +3443,68 @@ static const u8 sMagmaEmblemDesc[] = _(
"A medal-like item in\n"
"the same shape as\n"
"Team Magma's mark.");
static const u8 sContestPassDesc[] = _(
"The pass required\n"
"for entering\n"
"Pokémon Contests.");
static const u8 sOaksParcelDesc[] = _(
"A parcel for Prof.\n"
"Oak from a Pokémon\n"
"Mart's clerk.");
static const u8 sSecretKeyDesc[] = _(
"The key to the\n"
"Cinnabar Island\n"
"Gym's entrance.");
static const u8 sBikeVoucherDesc[] = _(
"A voucher for\n"
"obtaining a bicycle\n"
"from the Bike Shop.");
static const u8 sGoldTeethDesc[] = _(
"Gold dentures lost\n"
"by the Safari\n"
"Zone's Warden.");
static const u8 sCardKeyDesc[] = _(
"A card-type door\n"
"key used in Silph\n"
"Co's office.");
static const u8 sLiftKeyDesc[] = _(
"An elevator key\n"
"used in Team\n"
"Rocket's Hideout.");
static const u8 sSilphScopeDesc[] = _(
"Silph Co's scope\n"
"makes unseeable\n"
"POKéMON visible.");
static const u8 sTriPassDesc[] = _(
"A pass for ferries\n"
"between One, Two,\n"
"and Three Island.");
static const u8 sRainbowPassDesc[] = _(
"For ferries serving\n"
"Vermilion and the\n"
"Sevii Islands.");
static const u8 sTeaDesc[] = _(
"A thirst-quenching\n"
"tea prepared by an\n"
"old lady.");
static const u8 sRubyDesc[] = _(
"An exquisite, red-\n"
"glowing gem that\n"
"symbolizes passion.");
static const u8 sSapphireDesc[] = _(
"A brilliant blue gem\n"
"that symbolizes\n"
"honesty.");