From ad8cfda8313098a5318f51cbdffa88224e0041aa Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 6 Jul 2021 17:03:46 -0700 Subject: [PATCH] Add and rearrange Key Items. --- .../scripts.inc | 16 +- .../AbandonedShip_HiddenFloorRooms/map.json | 8 +- .../LilycoveCity_ContestLobby/scripts.inc | 1 - data/maps/Route110/scripts.inc | 2 +- data/maps/RusturfTunnel/scripts.inc | 2 +- .../scripts.inc | 2 +- .../{devon_goods.pal => devon_parts.pal} | 0 .../{itemfinder.pal => dowsing_machine.pal} | 0 .../{devon_goods.png => devon_parts.png} | Bin .../{itemfinder.png => dowsing_machine.png} | Bin .../{room1_key.png => key_to_room_1.png} | Bin .../{room2_key.png => key_to_room_2.png} | Bin .../{room4_key.png => key_to_room_4.png} | Bin .../{room6_key.png => key_to_room_6.png} | Bin include/constants/items.h | 117 ++- include/graphics.h | 174 ++-- src/data/graphics/items.h | 206 ++-- src/data/item_icon_table.h | 101 +- src/data/items.h | 893 ++++++++---------- src/data/text/item_descriptions.h | 386 ++++---- 20 files changed, 881 insertions(+), 1027 deletions(-) rename graphics/items/icon_palettes/{devon_goods.pal => devon_parts.pal} (100%) rename graphics/items/icon_palettes/{itemfinder.pal => dowsing_machine.pal} (100%) rename graphics/items/icons/{devon_goods.png => devon_parts.png} (100%) rename graphics/items/icons/{itemfinder.png => dowsing_machine.png} (100%) rename graphics/items/icons/{room1_key.png => key_to_room_1.png} (100%) rename graphics/items/icons/{room2_key.png => key_to_room_2.png} (100%) rename graphics/items/icons/{room4_key.png => key_to_room_4.png} (100%) rename graphics/items/icons/{room6_key.png => key_to_room_6.png} (100%) diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 612d46a9a4..fed9ea7235 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -53,12 +53,12 @@ AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: @ 8238A0F AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19 lockall goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen - checkitem ITEM_ROOM_1_KEY, 1 + checkitem ITEM_KEY_TO_ROOM_1, 1 compare VAR_RESULT, FALSE goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN - removeitem ITEM_ROOM_1_KEY + removeitem ITEM_KEY_TO_ROOM_1 setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 special DrawWholeMapView @@ -68,12 +68,12 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19 AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50 lockall goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen - checkitem ITEM_ROOM_2_KEY, 1 + checkitem ITEM_KEY_TO_ROOM_2, 1 compare VAR_RESULT, FALSE goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN - removeitem ITEM_ROOM_2_KEY + removeitem ITEM_KEY_TO_ROOM_2 setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 special DrawWholeMapView @@ -83,12 +83,12 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50 AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87 lockall goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen - checkitem ITEM_ROOM_4_KEY, 1 + checkitem ITEM_KEY_TO_ROOM_4, 1 compare VAR_RESULT, FALSE goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN - removeitem ITEM_ROOM_4_KEY + removeitem ITEM_KEY_TO_ROOM_4 setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 special DrawWholeMapView @@ -98,12 +98,12 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87 AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE lockall goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen - checkitem ITEM_ROOM_6_KEY, 1 + checkitem ITEM_KEY_TO_ROOM_6, 1 compare VAR_RESULT, FALSE goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT playse SE_PIN - removeitem ITEM_ROOM_6_KEY + removeitem ITEM_KEY_TO_ROOM_6 setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 special DrawWholeMapView diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index b81c33c843..8b6e05f12f 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -139,7 +139,7 @@ "x": 42, "y": 10, "elevation": 3, - "item": "ITEM_ROOM_1_KEY", + "item": "ITEM_KEY_TO_ROOM_1", "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY" }, { @@ -147,7 +147,7 @@ "x": 20, "y": 5, "elevation": 3, - "item": "ITEM_ROOM_2_KEY", + "item": "ITEM_KEY_TO_ROOM_2", "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY" }, { @@ -155,7 +155,7 @@ "x": 1, "y": 12, "elevation": 3, - "item": "ITEM_ROOM_4_KEY", + "item": "ITEM_KEY_TO_ROOM_4", "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY" }, { @@ -163,7 +163,7 @@ "x": 1, "y": 2, "elevation": 0, - "item": "ITEM_ROOM_6_KEY", + "item": "ITEM_KEY_TO_ROOM_6", "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY" }, { diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 458585ea45..128c4b71dd 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -366,7 +366,6 @@ LilycoveCity_ContestLobby_EventScript_SetMasterContestType:: @ 821A5C9 LilycoveCity_ContestLobby_EventScript_SetDebug:: @ 821A5CF setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 - additem ITEM_CONTEST_PASS setvar VAR_0x800B, 8 setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index f7be3fb9e7..c3a6470062 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -478,7 +478,7 @@ Route110_EventScript_BrendanDefeated:: @ 81EF8C4 end Route110_EventScript_GiveItemfinder:: @ 81EF8DF - giveitem ITEM_ITEMFINDER + giveitem ITEM_DOWSING_MACHINE return Route110_EventScript_RivalExit:: @ 81EF8EC diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 75f5820e0a..15309445c8 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -320,7 +320,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT - giveitem ITEM_DEVON_GOODS + giveitem ITEM_DEVON_PARTS closemessage applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt applymovement LOCALID_GRUNT, RusturfTunnel_Movement_GruntEscape diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 782e702f6b..650168f4f4 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -76,7 +76,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT - setvar VAR_0x8004, ITEM_DEVON_GOODS + setvar VAR_0x8004, ITEM_DEVON_PARTS call Common_EventScript_PlayerHandedOverTheItem msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT closemessage diff --git a/graphics/items/icon_palettes/devon_goods.pal b/graphics/items/icon_palettes/devon_parts.pal similarity index 100% rename from graphics/items/icon_palettes/devon_goods.pal rename to graphics/items/icon_palettes/devon_parts.pal diff --git a/graphics/items/icon_palettes/itemfinder.pal b/graphics/items/icon_palettes/dowsing_machine.pal similarity index 100% rename from graphics/items/icon_palettes/itemfinder.pal rename to graphics/items/icon_palettes/dowsing_machine.pal diff --git a/graphics/items/icons/devon_goods.png b/graphics/items/icons/devon_parts.png similarity index 100% rename from graphics/items/icons/devon_goods.png rename to graphics/items/icons/devon_parts.png diff --git a/graphics/items/icons/itemfinder.png b/graphics/items/icons/dowsing_machine.png similarity index 100% rename from graphics/items/icons/itemfinder.png rename to graphics/items/icons/dowsing_machine.png diff --git a/graphics/items/icons/room1_key.png b/graphics/items/icons/key_to_room_1.png similarity index 100% rename from graphics/items/icons/room1_key.png rename to graphics/items/icons/key_to_room_1.png diff --git a/graphics/items/icons/room2_key.png b/graphics/items/icons/key_to_room_2.png similarity index 100% rename from graphics/items/icons/room2_key.png rename to graphics/items/icons/key_to_room_2.png diff --git a/graphics/items/icons/room4_key.png b/graphics/items/icons/key_to_room_4.png similarity index 100% rename from graphics/items/icons/room4_key.png rename to graphics/items/icons/key_to_room_4.png diff --git a/graphics/items/icons/room6_key.png b/graphics/items/icons/key_to_room_6.png similarity index 100% rename from graphics/items/icons/room6_key.png rename to graphics/items/icons/key_to_room_6.png diff --git a/include/constants/items.h b/include/constants/items.h index 779cbbcd82..4f26965274 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -850,67 +850,66 @@ #define ITEM_HM06_ROCK_SMASH ITEM_HM06 #define ITEM_HM07_WATERFALL ITEM_HM07 #define ITEM_HM08_DIVE ITEM_HM08 -// Key Items -#define ITEM_MACH_BIKE 691 -#define ITEM_COIN_CASE 692 -#define ITEM_ITEMFINDER 693 -#define ITEM_OLD_ROD 694 -#define ITEM_GOOD_ROD 695 -#define ITEM_SUPER_ROD 696 -#define ITEM_SS_TICKET 697 -#define ITEM_CONTEST_PASS 698 -#define ITEM_WAILMER_PAIL 699 -#define ITEM_DEVON_GOODS 700 -#define ITEM_SOOT_SACK 701 -#define ITEM_BASEMENT_KEY 702 -#define ITEM_ACRO_BIKE 703 -#define ITEM_POKEBLOCK_CASE 704 -#define ITEM_LETTER 705 -#define ITEM_EON_TICKET 706 -#define ITEM_SCANNER 707 -#define ITEM_GO_GOGGLES 708 -#define ITEM_METEORITE 709 -#define ITEM_ROOM_1_KEY 710 -#define ITEM_ROOM_2_KEY 711 -#define ITEM_ROOM_4_KEY 712 -#define ITEM_ROOM_6_KEY 713 -#define ITEM_STORAGE_KEY 714 -#define ITEM_DEVON_SCOPE 715 -// FireRed/LeafGreen -#define ITEM_OAKS_PARCEL 716 -#define ITEM_POKE_FLUTE 717 -#define ITEM_SECRET_KEY 718 -#define ITEM_BIKE_VOUCHER 719 -#define ITEM_GOLD_TEETH 720 -#define ITEM_CARD_KEY 721 -#define ITEM_LIFT_KEY 722 -#define ITEM_SILPH_SCOPE 723 -#define ITEM_BICYCLE 724 -#define ITEM_TOWN_MAP 725 -#define ITEM_VS_SEEKER 726 -#define ITEM_FAME_CHECKER 727 -#define ITEM_TM_CASE 728 -#define ITEM_BERRY_POUCH 729 -#define ITEM_TEACHY_TV 730 -#define ITEM_TRI_PASS 731 -#define ITEM_RAINBOW_PASS 732 -#define ITEM_TEA 733 -#define ITEM_MYSTIC_TICKET 734 -#define ITEM_AURORA_TICKET 735 -#define ITEM_POWDER_JAR 736 -#define ITEM_RUBY 737 -#define ITEM_SAPPHIRE 738 -// Emerald -#define ITEM_MAGMA_EMBLEM 739 -#define ITEM_OLD_SEA_MAP 740 -#define ITEM_GRACIDEA 741 -#define ITEM_MEGA_BRACELET 742 -#define ITEM_SHINY_CHARM 743 -#define ITEM_OVAL_CHARM 744 -#define ITEM_Z_RING 745 +// Charms +#define ITEM_OVAL_CHARM 691 +#define ITEM_SHINY_CHARM 692 +#define ITEM_CATCHING_CHARM 693 +#define ITEM_EXP_CHARM 694 -#define ITEMS_COUNT 746 +// Form-changing Key Items +#define ITEM_ROTOM_CATALOG 695 +#define ITEM_GRACIDEA 696 +#define ITEM_REVEAL_GLASS 697 +#define ITEM_DNA_SPLICERS 698 +#define ITEM_ZYGARDE_CUBE 699 +#define ITEM_PRISON_BOTTLE 700 +#define ITEM_N_SOLARIZER 701 +#define ITEM_N_LUNARIZER 702 +#define ITEM_REINS_OF_UNITY 703 + +// Battle Mechanic Key Items +#define ITEM_KEY_STONE 704 +#define ITEM_MEGA_RING 705 +#define ITEM_Z_POWER_RING 706 +#define ITEM_DYNAMAX_BAND 707 + +// Misc. Key Items +#define ITEM_POKEMON_BOX_LINK 708 +#define ITEM_MACH_BIKE 709 +#define ITEM_ACRO_BIKE 710 +#define ITEM_OLD_ROD 711 +#define ITEM_GOOD_ROD 712 +#define ITEM_SUPER_ROD 713 +#define ITEM_DOWSING_MACHINE 714 +#define ITEM_TOWN_MAP 715 +#define ITEM_COIN_CASE 716 +#define ITEM_POWDER_JAR 717 +#define ITEM_WAILMER_PAIL 718 +#define ITEM_POKEBLOCK_CASE 719 +#define ITEM_SOOT_SACK 720 + +// Story Key Items +#define ITEM_SS_TICKET 721 +#define ITEM_EON_TICKET 722 +#define ITEM_MYSTIC_TICKET 723 +#define ITEM_AURORA_TICKET 724 +#define ITEM_OLD_SEA_MAP 725 +#define ITEM_LETTER 726 +#define ITEM_DEVON_PARTS 727 +#define ITEM_GO_GOGGLES 728 +#define ITEM_DEVON_SCOPE 729 +#define ITEM_BASEMENT_KEY 730 +#define ITEM_SCANNER 731 +#define ITEM_STORAGE_KEY 732 +#define ITEM_KEY_TO_ROOM_1 733 +#define ITEM_KEY_TO_ROOM_2 734 +#define ITEM_KEY_TO_ROOM_4 735 +#define ITEM_KEY_TO_ROOM_6 736 +#define ITEM_METEORITE 737 +#define ITEM_MAGMA_EMBLEM 738 + +#define ITEMS_COUNT 739 #define ITEM_FIELD_ARROW ITEMS_COUNT // Range of berries given out by various NPCS diff --git a/include/graphics.h b/include/graphics.h index 1b7bb1cde6..e1577f3fb1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4572,116 +4572,102 @@ extern const u32 gItemIconPalette_DragonTMHM[]; extern const u32 gItemIconPalette_DarkTMHM[]; extern const u32 gItemIconPalette_SteelTMHM[]; extern const u32 gItemIconPalette_FairyTMHM[]; -// Key items +// Charms +extern const u32 gItemIcon_OvalCharm[]; +extern const u32 gItemIconPalette_OvalCharm[]; +extern const u32 gItemIcon_ShinyCharm[]; +extern const u32 gItemIconPalette_ShinyCharm[]; +//extern const u32 gItemIcon_CatchingCharm[]; +//extern const u32 gItemIconPalette_CatchingCharm[]; +//extern const u32 gItemIcon_ExpCharm[]; +//extern const u32 gItemIconPalette_ExpCharm[]; +// Form-changing Key Items +//extern const u32 gItemIcon_RotomCatalog[]; +//extern const u32 gItemIconPalette_RotomCatalog[]; +extern const u32 gItemIcon_Gracidea[]; +extern const u32 gItemIconPalette_Gracidea[]; +//extern const u32 gItemIcon_RevealGlass[]; +//extern const u32 gItemIconPalette_RevealGlass[]; +//extern const u32 gItemIcon_DNASplicers[]; +//extern const u32 gItemIconPalette_DNASplicers[]; +//extern const u32 gItemIcon_ZygardeCube[]; +//extern const u32 gItemIconPalette_ZygardeCube[]; +//extern const u32 gItemIcon_PrisonBottle[]; +//extern const u32 gItemIconPalette_PrisonBottle[]; +//extern const u32 gItemIcon_NSolarizer[]; +//extern const u32 gItemIconPalette_NSolarizer[]; +//extern const u32 gItemIcon_NLunarizer[]; +//extern const u32 gItemIconPalette_NLunarizer[]; +//extern const u32 gItemIcon_ReinsOfUnity[]; +//extern const u32 gItemIconPalette_ReinsOfUnity[]; +// Battle Mechanic Key Items +//extern const u32 gItemIcon_KeyStone[]; +//extern const u32 gItemIconPalette_KeyStone[]; +//extern const u32 gItemIcon_MegaRing[]; +//extern const u32 gItemIconPalette_MegaRing[]; +//extern const u32 gItemIcon_ZPowerRing[]; +//extern const u32 gItemIconPalette_ZPowerRing[]; +//extern const u32 gItemIcon_DynamaxBand[]; +//extern const u32 gItemIconPalette_DynamaxBand[]; +// Misc. Key Items +//extern const u32 gItemIcon_PokemonBoxLink[]; +//extern const u32 gItemIconPalette_PokemonBoxLink[]; extern const u32 gItemIcon_MachBike[]; extern const u32 gItemIconPalette_MachBike[]; -extern const u32 gItemIcon_CoinCase[]; -extern const u32 gItemIconPalette_CoinCase[]; -extern const u32 gItemIcon_Itemfinder[]; -extern const u32 gItemIconPalette_Itemfinder[]; +extern const u32 gItemIcon_AcroBike[]; +extern const u32 gItemIconPalette_AcroBike[]; extern const u32 gItemIcon_OldRod[]; extern const u32 gItemIconPalette_OldRod[]; extern const u32 gItemIcon_GoodRod[]; extern const u32 gItemIconPalette_GoodRod[]; extern const u32 gItemIcon_SuperRod[]; extern const u32 gItemIconPalette_SuperRod[]; -extern const u32 gItemIcon_SSTicket[]; -extern const u32 gItemIconPalette_SSTicket[]; -extern const u32 gItemIcon_ContestPass[]; -extern const u32 gItemIconPalette_ContestPass[]; -extern const u32 gItemIcon_WailmerPail[]; -extern const u32 gItemIconPalette_WailmerPail[]; -extern const u32 gItemIcon_DevonGoods[]; -extern const u32 gItemIconPalette_DevonGoods[]; -extern const u32 gItemIcon_SootSack[]; -extern const u32 gItemIconPalette_SootSack[]; -extern const u32 gItemIcon_BasementKey[]; -extern const u32 gItemIconPalette_OldKey[]; -extern const u32 gItemIcon_AcroBike[]; -extern const u32 gItemIconPalette_AcroBike[]; -extern const u32 gItemIcon_PokeblockCase[]; -extern const u32 gItemIconPalette_PokeblockCase[]; -extern const u32 gItemIcon_Letter[]; -extern const u32 gItemIcon_EonTicket[]; -extern const u32 gItemIconPalette_EonTicket[]; -extern const u32 gItemIcon_Scanner[]; -extern const u32 gItemIconPalette_Scanner[]; -extern const u32 gItemIcon_GoGoggles[]; -extern const u32 gItemIconPalette_GoGoggles[]; -extern const u32 gItemIcon_Meteorite[]; -extern const u32 gItemIconPalette_Meteorite[]; -extern const u32 gItemIcon_Room1Key[]; -extern const u32 gItemIconPalette_Key[]; -extern const u32 gItemIcon_Room2Key[]; -extern const u32 gItemIcon_Room4Key[]; -extern const u32 gItemIcon_Room6Key[]; -extern const u32 gItemIcon_StorageKey[]; -extern const u32 gItemIcon_DevonScope[]; -extern const u32 gItemIconPalette_DevonScope[]; -// FireRed/LeafGreen key items -extern const u32 gItemIcon_OaksParcel[]; -extern const u32 gItemIconPalette_OaksParcel[]; -extern const u32 gItemIcon_PokeFlute[]; -extern const u32 gItemIconPalette_PokeFlute[]; -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 gItemIcon_SilphScope[]; -extern const u32 gItemIconPalette_SilphScope[]; -extern const u32 gItemIcon_Bicycle[]; -extern const u32 gItemIconPalette_Bicycle[]; +extern const u32 gItemIcon_DowsingMachine[]; +extern const u32 gItemIconPalette_DowsingMachine[]; extern const u32 gItemIcon_TownMap[]; extern const u32 gItemIconPalette_TownMap[]; -extern const u32 gItemIcon_VSSeeker[]; -extern const u32 gItemIconPalette_VSSeeker[]; -extern const u32 gItemIcon_FameChecker[]; -extern const u32 gItemIconPalette_FameChecker[]; -extern const u32 gItemIcon_TMCase[]; -extern const u32 gItemIconPalette_TMCase[]; -extern const u32 gItemIcon_BerryPouch[]; -extern const u32 gItemIconPalette_BerryPouch[]; -extern const u32 gItemIcon_TeachyTV[]; -extern const u32 gItemIconPalette_TeachyTV[]; -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_CoinCase[]; +extern const u32 gItemIconPalette_CoinCase[]; +extern const u32 gItemIcon_PowderJar[]; +extern const u32 gItemIconPalette_PowderJar[]; +extern const u32 gItemIcon_WailmerPail[]; +extern const u32 gItemIconPalette_WailmerPail[]; +extern const u32 gItemIcon_PokeblockCase[]; +extern const u32 gItemIconPalette_PokeblockCase[]; +extern const u32 gItemIcon_SootSack[]; +extern const u32 gItemIconPalette_SootSack[]; +// Story Key Items +extern const u32 gItemIcon_SSTicket[]; +extern const u32 gItemIconPalette_SSTicket[]; +extern const u32 gItemIcon_EonTicket[]; +extern const u32 gItemIconPalette_EonTicket[]; extern const u32 gItemIcon_MysticTicket[]; extern const u32 gItemIconPalette_MysticTicket[]; extern const u32 gItemIcon_AuroraTicket[]; extern const u32 gItemIconPalette_AuroraTicket[]; -extern const u32 gItemIcon_PowderJar[]; -extern const u32 gItemIconPalette_PowderJar[]; -extern const u32 gItemIcon_Gem[]; -extern const u32 gItemIconPalette_Ruby[]; -extern const u32 gItemIconPalette_Sapphire[]; -// Emerald-only key items -extern const u32 gItemIcon_MagmaEmblem[]; -extern const u32 gItemIconPalette_MagmaEmblem[]; extern const u32 gItemIcon_OldSeaMap[]; extern const u32 gItemIconPalette_OldSeaMap[]; -// Gen 4 Items -extern const u32 gItemIcon_Gracidea[]; -extern const u32 gItemIconPalette_Gracidea[]; -// Gen 5 Items -extern const u32 gItemIcon_ShinyCharm[]; -extern const u32 gItemIconPalette_ShinyCharm[]; -extern const u32 gItemIcon_OvalCharm[]; -extern const u32 gItemIconPalette_OvalCharm[]; -// Gen 6 Items -extern const u32 gItemIcon_MegaBracelet[]; -extern const u32 gItemIconPalette_MegaBracelet[]; -// Gen 7 Items -extern const u32 gItemIcon_ZRing[]; -extern const u32 gItemIconPalette_ZRing[]; +extern const u32 gItemIcon_Letter[]; +extern const u32 gItemIcon_DevonParts[]; +extern const u32 gItemIconPalette_DevonParts[]; +extern const u32 gItemIcon_GoGoggles[]; +extern const u32 gItemIconPalette_GoGoggles[]; +extern const u32 gItemIcon_DevonScope[]; +extern const u32 gItemIconPalette_DevonScope[]; +extern const u32 gItemIcon_BasementKey[]; +extern const u32 gItemIconPalette_OldKey[]; +extern const u32 gItemIcon_Scanner[]; +extern const u32 gItemIconPalette_Scanner[]; +extern const u32 gItemIcon_StorageKey[]; +extern const u32 gItemIcon_KeyToRoom1[]; +extern const u32 gItemIconPalette_Key[]; +extern const u32 gItemIcon_KeyToRoom2[]; +extern const u32 gItemIcon_KeyToRoom4[]; +extern const u32 gItemIcon_KeyToRoom6[]; +extern const u32 gItemIcon_Meteorite[]; +extern const u32 gItemIconPalette_Meteorite[]; +extern const u32 gItemIcon_MagmaEmblem[]; +extern const u32 gItemIconPalette_MagmaEmblem[]; extern const u32 gItemIcon_ReturnToFieldArrow[]; extern const u32 gItemIconPalette_ReturnToFieldArrow[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 16f63e3282..7ce4b21882 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -1827,16 +1827,79 @@ const u32 gItemIconPalette_SteelTMHM[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIconPalette_FairyTMHM[] = INCBIN_U32("graphics/items/icon_palettes/fairy_tm_hm.gbapal.lz"); -// Key items +// Charms + +const u32 gItemIcon_OvalCharm[] = INCBIN_U32("graphics/items/icons/oval_charm.4bpp.lz"); +const u32 gItemIconPalette_OvalCharm[] = INCBIN_U32("graphics/items/icon_palettes/oval_charm.gbapal.lz"); + +const u32 gItemIcon_ShinyCharm[] = INCBIN_U32("graphics/items/icons/shiny_charm.4bpp.lz"); +const u32 gItemIconPalette_ShinyCharm[] = INCBIN_U32("graphics/items/icon_palettes/shiny_charm.gbapal.lz"); + +//const u32 gItemIcon_CatchingCharm[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_CatchingCharm[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_ExpCharm[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_ExpCharm[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +// Form-changing Key Items + +//const u32 gItemIcon_RotomCatalog[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_RotomCatalog[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +const u32 gItemIcon_Gracidea[] = INCBIN_U32("graphics/items/icons/gracidea.4bpp.lz"); +const u32 gItemIconPalette_Gracidea[] = INCBIN_U32("graphics/items/icon_palettes/gracidea.gbapal.lz"); + +//const u32 gItemIcon_RevealGlass[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_RevealGlass[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_DNASplicers[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_DNASplicers[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_ZygardeCube[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_ZygardeCube[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_PrisonBottle[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_PrisonBottle[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_NSolarizer[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_NSolarizer[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_NLunarizer[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_NLunarizer[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_ReinsOfUnity[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_ReinsOfUnity[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +// Battle Mechanic Key Items + +//const u32 gItemIcon_KeyStone[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_KeyStone[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_MegaRing[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_MegaRing[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_MegaBracelet[] = INCBIN_U32("graphics/items/icons/mega_bracelet.4bpp.lz"); // Remove +//const u32 gItemIconPalette_MegaBracelet[] = INCBIN_U32("graphics/items/icon_palettes/mega_bracelet.gbapal.lz"); // Remove + +//const u32 gItemIcon_ZPowerRing[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_ZPowerRing[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +//const u32 gItemIcon_ZRing[] = INCBIN_U32("graphics/items/icons/z_ring.4bpp.lz"); // Remove +//const u32 gItemIconPalette_ZRing[] = INCBIN_U32("graphics/items/icon_palettes/z_ring.gbapal.lz"); // Remove + +//const u32 gItemIcon_DynamaxBand[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +//const u32 gItemIconPalette_DynamaxBand[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); + +// Misc. Key Items + +//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"); const u32 gItemIcon_MachBike[] = INCBIN_U32("graphics/items/icons/mach_bike.4bpp.lz"); const u32 gItemIconPalette_MachBike[] = INCBIN_U32("graphics/items/icon_palettes/mach_bike.gbapal.lz"); -const u32 gItemIcon_CoinCase[] = INCBIN_U32("graphics/items/icons/coin_case.4bpp.lz"); -const u32 gItemIconPalette_CoinCase[] = INCBIN_U32("graphics/items/icon_palettes/coin_case.gbapal.lz"); - -const u32 gItemIcon_Itemfinder[] = INCBIN_U32("graphics/items/icons/itemfinder.4bpp.lz"); -const u32 gItemIconPalette_Itemfinder[] = INCBIN_U32("graphics/items/icon_palettes/itemfinder.gbapal.lz"); +const u32 gItemIcon_AcroBike[] = INCBIN_U32("graphics/items/icons/acro_bike.4bpp.lz"); +const u32 gItemIconPalette_AcroBike[] = INCBIN_U32("graphics/items/icon_palettes/acro_bike.gbapal.lz"); const u32 gItemIcon_OldRod[] = INCBIN_U32("graphics/items/icons/old_rod.4bpp.lz"); const u32 gItemIconPalette_OldRod[] = INCBIN_U32("graphics/items/icon_palettes/old_rod.gbapal.lz"); @@ -1847,59 +1910,81 @@ const u32 gItemIconPalette_GoodRod[] = INCBIN_U32("graphics/items/icon_palettes/ const u32 gItemIcon_SuperRod[] = INCBIN_U32("graphics/items/icons/super_rod.4bpp.lz"); const u32 gItemIconPalette_SuperRod[] = INCBIN_U32("graphics/items/icon_palettes/super_rod.gbapal.lz"); -const u32 gItemIcon_SSTicket[] = INCBIN_U32("graphics/items/icons/ss_ticket.4bpp.lz"); -const u32 gItemIconPalette_SSTicket[] = INCBIN_U32("graphics/items/icon_palettes/ss_ticket.gbapal.lz"); +const u32 gItemIcon_DowsingMachine[] = INCBIN_U32("graphics/items/icons/dowsing_machine.4bpp.lz"); +const u32 gItemIconPalette_DowsingMachine[] = INCBIN_U32("graphics/items/icon_palettes/dowsing_machine.gbapal.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_TownMap[] = INCBIN_U32("graphics/items/icons/town_map.4bpp.lz"); +const u32 gItemIconPalette_TownMap[] = INCBIN_U32("graphics/items/icon_palettes/town_map.gbapal.lz"); + +const u32 gItemIcon_CoinCase[] = INCBIN_U32("graphics/items/icons/coin_case.4bpp.lz"); +const u32 gItemIconPalette_CoinCase[] = INCBIN_U32("graphics/items/icon_palettes/coin_case.gbapal.lz"); + +const u32 gItemIcon_PowderJar[] = INCBIN_U32("graphics/items/icons/powder_jar.4bpp.lz"); +const u32 gItemIconPalette_PowderJar[] = INCBIN_U32("graphics/items/icon_palettes/powder_jar.gbapal.lz"); const u32 gItemIcon_WailmerPail[] = INCBIN_U32("graphics/items/icons/wailmer_pail.4bpp.lz"); const u32 gItemIconPalette_WailmerPail[] = INCBIN_U32("graphics/items/icon_palettes/wailmer_pail.gbapal.lz"); -const u32 gItemIcon_DevonGoods[] = INCBIN_U32("graphics/items/icons/devon_goods.4bpp.lz"); -const u32 gItemIconPalette_DevonGoods[] = INCBIN_U32("graphics/items/icon_palettes/devon_goods.gbapal.lz"); +const u32 gItemIcon_PokeblockCase[] = INCBIN_U32("graphics/items/icons/pokeblock_case.4bpp.lz"); +const u32 gItemIconPalette_PokeblockCase[] = INCBIN_U32("graphics/items/icon_palettes/pokeblock_case.gbapal.lz"); 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_BasementKey[] = INCBIN_U32("graphics/items/icons/basement_key.4bpp.lz"); -const u32 gItemIconPalette_OldKey[] = INCBIN_U32("graphics/items/icon_palettes/old_key.gbapal.lz"); +// Story Key Items -const u32 gItemIcon_AcroBike[] = INCBIN_U32("graphics/items/icons/acro_bike.4bpp.lz"); -const u32 gItemIconPalette_AcroBike[] = INCBIN_U32("graphics/items/icon_palettes/acro_bike.gbapal.lz"); - -const u32 gItemIcon_PokeblockCase[] = INCBIN_U32("graphics/items/icons/pokeblock_case.4bpp.lz"); -const u32 gItemIconPalette_PokeblockCase[] = INCBIN_U32("graphics/items/icon_palettes/pokeblock_case.gbapal.lz"); - -const u32 gItemIcon_Letter[] = INCBIN_U32("graphics/items/icons/letter.4bpp.lz"); +const u32 gItemIcon_SSTicket[] = INCBIN_U32("graphics/items/icons/ss_ticket.4bpp.lz"); +const u32 gItemIconPalette_SSTicket[] = INCBIN_U32("graphics/items/icon_palettes/ss_ticket.gbapal.lz"); const u32 gItemIcon_EonTicket[] = INCBIN_U32("graphics/items/icons/eon_ticket.4bpp.lz"); const u32 gItemIconPalette_EonTicket[] = INCBIN_U32("graphics/items/icon_palettes/eon_ticket.gbapal.lz"); -const u32 gItemIcon_Scanner[] = INCBIN_U32("graphics/items/icons/scanner.4bpp.lz"); -const u32 gItemIconPalette_Scanner[] = INCBIN_U32("graphics/items/icon_palettes/scanner.gbapal.lz"); +const u32 gItemIcon_MysticTicket[] = INCBIN_U32("graphics/items/icons/mystic_ticket.4bpp.lz"); +const u32 gItemIconPalette_MysticTicket[] = INCBIN_U32("graphics/items/icon_palettes/mystic_ticket.gbapal.lz"); + +const u32 gItemIcon_AuroraTicket[] = INCBIN_U32("graphics/items/icons/aurora_ticket.4bpp.lz"); +const u32 gItemIconPalette_AuroraTicket[] = INCBIN_U32("graphics/items/icon_palettes/aurora_ticket.gbapal.lz"); + +const u32 gItemIcon_OldSeaMap[] = INCBIN_U32("graphics/items/icons/old_sea_map.4bpp.lz"); +const u32 gItemIconPalette_OldSeaMap[] = INCBIN_U32("graphics/items/icon_palettes/old_sea_map.gbapal.lz"); + +const u32 gItemIcon_Letter[] = INCBIN_U32("graphics/items/icons/letter.4bpp.lz"); + +const u32 gItemIcon_DevonParts[] = INCBIN_U32("graphics/items/icons/devon_parts.4bpp.lz"); +const u32 gItemIconPalette_DevonParts[] = INCBIN_U32("graphics/items/icon_palettes/devon_parts.gbapal.lz"); const u32 gItemIcon_GoGoggles[] = INCBIN_U32("graphics/items/icons/go_goggles.4bpp.lz"); const u32 gItemIconPalette_GoGoggles[] = INCBIN_U32("graphics/items/icon_palettes/go_goggles.gbapal.lz"); -const u32 gItemIcon_Meteorite[] = INCBIN_U32("graphics/items/icons/meteorite.4bpp.lz"); -const u32 gItemIconPalette_Meteorite[] = INCBIN_U32("graphics/items/icon_palettes/meteorite.gbapal.lz"); - -const u32 gItemIcon_Room1Key[] = INCBIN_U32("graphics/items/icons/room1_key.4bpp.lz"); -const u32 gItemIconPalette_Key[] = INCBIN_U32("graphics/items/icon_palettes/key.gbapal.lz"); - -const u32 gItemIcon_Room2Key[] = INCBIN_U32("graphics/items/icons/room2_key.4bpp.lz"); - -const u32 gItemIcon_Room4Key[] = INCBIN_U32("graphics/items/icons/room4_key.4bpp.lz"); - -const u32 gItemIcon_Room6Key[] = INCBIN_U32("graphics/items/icons/room6_key.4bpp.lz"); - -const u32 gItemIcon_StorageKey[] = INCBIN_U32("graphics/items/icons/storage_key.4bpp.lz"); - const u32 gItemIcon_DevonScope[] = INCBIN_U32("graphics/items/icons/devon_scope.4bpp.lz"); const u32 gItemIconPalette_DevonScope[] = INCBIN_U32("graphics/items/icon_palettes/devon_scope.gbapal.lz"); -// FireRed/LeafGreen key items +const u32 gItemIcon_BasementKey[] = INCBIN_U32("graphics/items/icons/basement_key.4bpp.lz"); +const u32 gItemIconPalette_OldKey[] = INCBIN_U32("graphics/items/icon_palettes/old_key.gbapal.lz"); + +const u32 gItemIcon_Scanner[] = INCBIN_U32("graphics/items/icons/scanner.4bpp.lz"); +const u32 gItemIconPalette_Scanner[] = INCBIN_U32("graphics/items/icon_palettes/scanner.gbapal.lz"); + +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"); + +const u32 gItemIcon_KeyToRoom4[] = INCBIN_U32("graphics/items/icons/key_to_room_4.4bpp.lz"); + +const u32 gItemIcon_KeyToRoom6[] = INCBIN_U32("graphics/items/icons/key_to_room_6.4bpp.lz"); + +const u32 gItemIcon_Meteorite[] = INCBIN_U32("graphics/items/icons/meteorite.4bpp.lz"); +const u32 gItemIconPalette_Meteorite[] = INCBIN_U32("graphics/items/icon_palettes/meteorite.gbapal.lz"); + +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 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"); @@ -1927,9 +2012,6 @@ const u32 gItemIconPalette_SilphScope[] = INCBIN_U32("graphics/items/icon_palett 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_TownMap[] = INCBIN_U32("graphics/items/icons/town_map.4bpp.lz"); -const u32 gItemIconPalette_TownMap[] = INCBIN_U32("graphics/items/icon_palettes/town_map.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"); @@ -1954,47 +2036,7 @@ 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_MysticTicket[] = INCBIN_U32("graphics/items/icons/mystic_ticket.4bpp.lz"); -const u32 gItemIconPalette_MysticTicket[] = INCBIN_U32("graphics/items/icon_palettes/mystic_ticket.gbapal.lz"); - -const u32 gItemIcon_AuroraTicket[] = INCBIN_U32("graphics/items/icons/aurora_ticket.4bpp.lz"); -const u32 gItemIconPalette_AuroraTicket[] = INCBIN_U32("graphics/items/icon_palettes/aurora_ticket.gbapal.lz"); - -const u32 gItemIcon_PowderJar[] = INCBIN_U32("graphics/items/icons/powder_jar.4bpp.lz"); -const u32 gItemIconPalette_PowderJar[] = INCBIN_U32("graphics/items/icon_palettes/powder_jar.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 gItemIconPalette_Sapphire[] = INCBIN_U32("graphics/items/icon_palettes/sapphire.gbapal.lz"); - -// Emerald-only key items - -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"); - -const u32 gItemIcon_OldSeaMap[] = INCBIN_U32("graphics/items/icons/old_sea_map.4bpp.lz"); -const u32 gItemIconPalette_OldSeaMap[] = INCBIN_U32("graphics/items/icon_palettes/old_sea_map.gbapal.lz"); - -// Gen 4 Items - -const u32 gItemIcon_Gracidea[] = INCBIN_U32("graphics/items/icons/gracidea.4bpp.lz"); -const u32 gItemIconPalette_Gracidea[] = INCBIN_U32("graphics/items/icon_palettes/gracidea.gbapal.lz"); - -// Gen 5 Items - -const u32 gItemIcon_ShinyCharm[] = INCBIN_U32("graphics/items/icons/shiny_charm.4bpp.lz"); -const u32 gItemIconPalette_ShinyCharm[] = INCBIN_U32("graphics/items/icon_palettes/shiny_charm.gbapal.lz"); - -const u32 gItemIcon_OvalCharm[] = INCBIN_U32("graphics/items/icons/oval_charm.4bpp.lz"); -const u32 gItemIconPalette_OvalCharm[] = INCBIN_U32("graphics/items/icon_palettes/oval_charm.gbapal.lz"); - -// Gen 6 Items - -const u32 gItemIcon_MegaBracelet[] = INCBIN_U32("graphics/items/icons/mega_bracelet.4bpp.lz"); -const u32 gItemIconPalette_MegaBracelet[] = INCBIN_U32("graphics/items/icon_palettes/mega_bracelet.gbapal.lz"); - -// Gen 7 Items - -const u32 gItemIcon_ZRing[] = INCBIN_U32("graphics/items/icons/z_ring.4bpp.lz"); -const u32 gItemIconPalette_ZRing[] = INCBIN_U32("graphics/items/icon_palettes/z_ring.gbapal.lz"); +const u32 gItemIconPalette_Sapphire[] = INCBIN_U32("graphics/items/icon_palettes/sapphire.gbapal.lz");*/ diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 16b65213e7..826747a676 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -731,68 +731,61 @@ const u32 *const gItemIconTable[][2] = [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, - // Key items + // Charms + [ITEM_OVAL_CHARM] = {gItemIcon_OvalCharm, gItemIconPalette_OvalCharm}, + [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm}, + [ITEM_CATCHING_CHARM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_EXP_CHARM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + // Form-changing Key Items + [ITEM_ROTOM_CATALOG] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_GRACIDEA] = {gItemIcon_Gracidea, gItemIconPalette_Gracidea}, + [ITEM_REVEAL_GLASS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_DNA_SPLICERS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_ZYGARDE_CUBE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_PRISON_BOTTLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_N_SOLARIZER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_N_LUNARIZER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_REINS_OF_UNITY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + // Battle Mechanic Key Items + [ITEM_KEY_STONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_MEGA_RING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + //[ITEM_MEGA_BRACELET] = {gItemIcon_MegaBracelet, gItemIconPalette_MegaBracelet}, // Remove + [ITEM_Z_POWER_RING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + //[ITEM_Z_RING] = {gItemIcon_ZRing, gItemIconPalette_ZRing}, // Remove + [ITEM_DYNAMAX_BAND] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + // Misc. Key Items + [ITEM_POKEMON_BOX_LINK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo [ITEM_MACH_BIKE] = {gItemIcon_MachBike, gItemIconPalette_MachBike}, - [ITEM_COIN_CASE] = {gItemIcon_CoinCase, gItemIconPalette_CoinCase}, - [ITEM_ITEMFINDER] = {gItemIcon_Itemfinder, gItemIconPalette_Itemfinder}, + [ITEM_ACRO_BIKE] = {gItemIcon_AcroBike, gItemIconPalette_AcroBike}, [ITEM_OLD_ROD] = {gItemIcon_OldRod, gItemIconPalette_OldRod}, [ITEM_GOOD_ROD] = {gItemIcon_GoodRod, gItemIconPalette_GoodRod}, [ITEM_SUPER_ROD] = {gItemIcon_SuperRod, gItemIconPalette_SuperRod}, - [ITEM_SS_TICKET] = {gItemIcon_SSTicket, gItemIconPalette_SSTicket}, - [ITEM_CONTEST_PASS] = {gItemIcon_ContestPass, gItemIconPalette_ContestPass}, - [ITEM_WAILMER_PAIL] = {gItemIcon_WailmerPail, gItemIconPalette_WailmerPail}, - [ITEM_DEVON_GOODS] = {gItemIcon_DevonGoods, gItemIconPalette_DevonGoods}, - [ITEM_SOOT_SACK] = {gItemIcon_SootSack, gItemIconPalette_SootSack}, - [ITEM_BASEMENT_KEY] = {gItemIcon_BasementKey, gItemIconPalette_OldKey}, - [ITEM_ACRO_BIKE] = {gItemIcon_AcroBike, gItemIconPalette_AcroBike}, - [ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase}, - [ITEM_LETTER] = {gItemIcon_Letter, gItemIconPalette_LavaCookieAndLetter}, - [ITEM_EON_TICKET] = {gItemIcon_EonTicket, gItemIconPalette_EonTicket}, - [ITEM_SCANNER] = {gItemIcon_Scanner, gItemIconPalette_Scanner}, - [ITEM_GO_GOGGLES] = {gItemIcon_GoGoggles, gItemIconPalette_GoGoggles}, - [ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite}, - [ITEM_ROOM_1_KEY] = {gItemIcon_Room1Key, gItemIconPalette_Key}, - [ITEM_ROOM_2_KEY] = {gItemIcon_Room2Key, gItemIconPalette_Key}, - [ITEM_ROOM_4_KEY] = {gItemIcon_Room4Key, gItemIconPalette_Key}, - [ITEM_ROOM_6_KEY] = {gItemIcon_Room6Key, gItemIconPalette_Key}, - [ITEM_STORAGE_KEY] = {gItemIcon_StorageKey, gItemIconPalette_OldKey}, - [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope}, - // FireRed/LeafGreen key items - [ITEM_OAKS_PARCEL] = {gItemIcon_OaksParcel, gItemIconPalette_OaksParcel}, - [ITEM_POKE_FLUTE] = {gItemIcon_PokeFlute, gItemIconPalette_PokeFlute}, - [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_BICYCLE] = {gItemIcon_Bicycle, gItemIconPalette_Bicycle}, + [ITEM_DOWSING_MACHINE] = {gItemIcon_DowsingMachine, gItemIconPalette_DowsingMachine}, [ITEM_TOWN_MAP] = {gItemIcon_TownMap, gItemIconPalette_TownMap}, - [ITEM_VS_SEEKER] = {gItemIcon_VSSeeker, gItemIconPalette_VSSeeker}, - [ITEM_FAME_CHECKER] = {gItemIcon_FameChecker, gItemIconPalette_FameChecker}, - [ITEM_TM_CASE] = {gItemIcon_TMCase, gItemIconPalette_TMCase}, - [ITEM_BERRY_POUCH] = {gItemIcon_BerryPouch, gItemIconPalette_BerryPouch}, - [ITEM_TEACHY_TV] = {gItemIcon_TeachyTV, gItemIconPalette_TeachyTV}, - [ITEM_TRI_PASS] = {gItemIcon_TriPass, gItemIconPalette_TriPass}, - [ITEM_RAINBOW_PASS] = {gItemIcon_RainbowPass, gItemIconPalette_RainbowPass}, - [ITEM_TEA] = {gItemIcon_Tea, gItemIconPalette_Tea}, + [ITEM_COIN_CASE] = {gItemIcon_CoinCase, gItemIconPalette_CoinCase}, + [ITEM_POWDER_JAR] = {gItemIcon_PowderJar, gItemIconPalette_PowderJar}, + [ITEM_WAILMER_PAIL] = {gItemIcon_WailmerPail, gItemIconPalette_WailmerPail}, + [ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase}, + [ITEM_SOOT_SACK] = {gItemIcon_SootSack, gItemIconPalette_SootSack}, + // Story Key Items + [ITEM_SS_TICKET] = {gItemIcon_SSTicket, gItemIconPalette_SSTicket}, + [ITEM_EON_TICKET] = {gItemIcon_EonTicket, gItemIconPalette_EonTicket}, [ITEM_MYSTIC_TICKET] = {gItemIcon_MysticTicket, gItemIconPalette_MysticTicket}, [ITEM_AURORA_TICKET] = {gItemIcon_AuroraTicket, gItemIconPalette_AuroraTicket}, - [ITEM_POWDER_JAR] = {gItemIcon_PowderJar, gItemIconPalette_PowderJar}, - [ITEM_RUBY] = {gItemIcon_Gem, gItemIconPalette_Ruby}, - [ITEM_SAPPHIRE] = {gItemIcon_Gem, gItemIconPalette_Sapphire}, - // Emerald-only key items - [ITEM_MAGMA_EMBLEM] = {gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem}, [ITEM_OLD_SEA_MAP] = {gItemIcon_OldSeaMap, gItemIconPalette_OldSeaMap}, - // New items - [ITEM_GRACIDEA] = {gItemIcon_Gracidea, gItemIconPalette_Gracidea}, - // Gen 5 Items - [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm}, - [ITEM_OVAL_CHARM] = {gItemIcon_OvalCharm, gItemIconPalette_OvalCharm}, - // Gen 6 Items - [ITEM_MEGA_BRACELET] = {gItemIcon_MegaBracelet, gItemIconPalette_MegaBracelet}, - // Gen 7 Items - [ITEM_Z_RING] = {gItemIcon_ZRing, gItemIconPalette_ZRing}, + [ITEM_LETTER] = {gItemIcon_Letter, gItemIconPalette_LavaCookieAndLetter}, + [ITEM_DEVON_PARTS] = {gItemIcon_DevonParts, gItemIconPalette_DevonParts}, + [ITEM_GO_GOGGLES] = {gItemIcon_GoGoggles, gItemIconPalette_GoGoggles}, + [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope}, + [ITEM_BASEMENT_KEY] = {gItemIcon_BasementKey, gItemIconPalette_OldKey}, + [ITEM_SCANNER] = {gItemIcon_Scanner, gItemIconPalette_Scanner}, + [ITEM_STORAGE_KEY] = {gItemIcon_StorageKey, gItemIconPalette_OldKey}, + [ITEM_KEY_TO_ROOM_1] = {gItemIcon_KeyToRoom1, gItemIconPalette_Key}, + [ITEM_KEY_TO_ROOM_2] = {gItemIcon_KeyToRoom2, gItemIconPalette_Key}, + [ITEM_KEY_TO_ROOM_4] = {gItemIcon_KeyToRoom4, gItemIconPalette_Key}, + [ITEM_KEY_TO_ROOM_6] = {gItemIcon_KeyToRoom6, gItemIconPalette_Key}, + [ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite}, + [ITEM_MAGMA_EMBLEM] = {gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem}, // Return to field arrow [ITEM_FIELD_ARROW] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow}, }; diff --git a/src/data/items.h b/src/data/items.h index fa2edce1bb..e42c25dca9 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -8466,7 +8466,218 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_TMHM, }, -// Key Items + +// Charms + + [ITEM_OVAL_CHARM] = + { + .name = _("Oval Charm"), + .itemId = ITEM_OVAL_CHARM, + .price = 0, + .importance = 1, + .description = sOvalCharmDesc, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_SHINY_CHARM] = + { + .name = _("Shiny Charm"), + .itemId = ITEM_SHINY_CHARM, + .price = 0, + .importance = 1, + .description = sShinyCharmDesc, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_CATCHING_CHARM] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_EXP_CHARM] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + +// Form-changing Key Items + + [ITEM_ROTOM_CATALOG] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_GRACIDEA] = + { + .name = _("Gracidea"), + .itemId = ITEM_GRACIDEA, + .price = 0, + .holdEffect = HOLD_EFFECT_GRACIDEA, + .description = sGracideaDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_REVEAL_GLASS] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_DNA_SPLICERS] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_ZYGARDE_CUBE] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_PRISON_BOTTLE] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_N_SOLARIZER] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_N_LUNARIZER] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_REINS_OF_UNITY] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + +// Battle Mechanic Key Items + + [ITEM_KEY_STONE] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_MEGA_RING] = // Todo (Replaces ITEM_MEGA_BRACELET) + { + .name = _("Mega Bracelet"), + .itemId = ITEM_MEGA_RING, + .price = 0, + .importance = 1, + .description = sMegaRingDesc, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_Z_POWER_RING] = // Todo (Replaces ITEM_Z_POWER_RING) + { + .name = _("Z-Ring"), + .itemId = ITEM_Z_POWER_RING, + .price = 0, + .holdEffect = HOLD_EFFECT_NONE, + .description = sZPowerRingDesc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_DYNAMAX_BAND] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + +// Misc. Key Items + + [ITEM_POKEMON_BOX_LINK] = // Todo + { + .name = _("????????"), + .itemId = ITEM_NONE, + .price = 0, + .description = sDummyDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, [ITEM_MACH_BIKE] = { @@ -8482,29 +8693,18 @@ const struct Item gItems[] = .secondaryId = MACH_BIKE, }, - [ITEM_COIN_CASE] = + [ITEM_ACRO_BIKE] = { - .name = _("Coin Case"), - .itemId = ITEM_COIN_CASE, + .name = _("Acro Bike"), + .itemId = ITEM_ACRO_BIKE, .price = 0, - .description = sCoinCaseDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CoinCase, - }, - - [ITEM_ITEMFINDER] = - { - .name = _("Dowsing MCHN"), - .itemId = ITEM_ITEMFINDER, - .price = 0, - .description = sItemfinderDesc, + .description = sAcroBikeDesc, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, - .fieldUseFunc = ItemUseOutOfBattle_Itemfinder, + .fieldUseFunc = ItemUseOutOfBattle_Bike, + .secondaryId = ACRO_BIKE, }, [ITEM_OLD_ROD] = @@ -8549,28 +8749,55 @@ const struct Item gItems[] = .secondaryId = SUPER_ROD, }, - [ITEM_SS_TICKET] = + [ITEM_DOWSING_MACHINE] = { - .name = _("S.S. Ticket"), - .itemId = ITEM_SS_TICKET, + .name = _("Dowsing MCHN"), + .itemId = ITEM_DOWSING_MACHINE, .price = 0, - .description = sSSTicketDesc, + .description = sDowsingMachineDesc, .importance = 1, + .unk19 = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_FIELD, + .fieldUseFunc = ItemUseOutOfBattle_Itemfinder, + }, + + [ITEM_TOWN_MAP] = + { + .name = _("Town Map"), + .itemId = ITEM_TOWN_MAP, + .price = 0, + .description = sTownMapDesc, + .importance = 1, + .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_CONTEST_PASS] = + [ITEM_COIN_CASE] = { - .name = _("Contest Pass"), - .itemId = ITEM_CONTEST_PASS, + .name = _("Coin Case"), + .itemId = ITEM_COIN_CASE, .price = 0, - .description = sContestPassDesc, + .description = sCoinCaseDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CoinCase, + }, + + [ITEM_POWDER_JAR] = + { + .name = _("Powder Jar"), + .itemId = ITEM_POWDER_JAR, + .price = 0, + .description = sPowderJarDesc, + .importance = 1, + .unk19 = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_PowderJar, }, [ITEM_WAILMER_PAIL] = @@ -8585,16 +8812,17 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_WailmerPail, }, - [ITEM_DEVON_GOODS] = + [ITEM_POKEBLOCK_CASE] = { - .name = _("Devon Parts"), - .itemId = ITEM_DEVON_GOODS, + .name = _("{POKEBLOCK} Case"), + .itemId = ITEM_POKEBLOCK_CASE, .price = 0, - .description = sDevonGoodsDesc, - .importance = 2, + .description = sPokeblockCaseDesc, + .importance = 1, + .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PBLOCK_CASE, + .fieldUseFunc = ItemUseOutOfBattle_PokeblockCase, }, [ITEM_SOOT_SACK] = @@ -8609,52 +8837,15 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_BASEMENT_KEY] = - { - .name = _("Basement Key"), - .itemId = ITEM_BASEMENT_KEY, - .price = 0, - .description = sBasementKeyDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, +// Story Key Items - [ITEM_ACRO_BIKE] = + [ITEM_SS_TICKET] = { - .name = _("Acro Bike"), - .itemId = ITEM_ACRO_BIKE, + .name = _("S.S. Ticket"), + .itemId = ITEM_SS_TICKET, .price = 0, - .description = sAcroBikeDesc, + .description = sSSTicketDesc, .importance = 1, - .unk19 = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_FIELD, - .fieldUseFunc = ItemUseOutOfBattle_Bike, - .secondaryId = ACRO_BIKE, - }, - - [ITEM_POKEBLOCK_CASE] = - { - .name = _("{POKEBLOCK} CASE"), - .itemId = ITEM_POKEBLOCK_CASE, - .price = 0, - .description = sPokeblockCaseDesc, - .importance = 1, - .unk19 = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_PBLOCK_CASE, - .fieldUseFunc = ItemUseOutOfBattle_PokeblockCase, - }, - - [ITEM_LETTER] = - { - .name = _("Letter"), - .itemId = ITEM_LETTER, - .price = 0, - .description = sLetterDesc, - .importance = 2, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -8673,342 +8864,6 @@ const struct Item gItems[] = .secondaryId = 1, }, - [ITEM_SCANNER] = - { - .name = _("Scanner"), - .itemId = ITEM_SCANNER, - .price = 0, - .description = sScannerDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_GO_GOGGLES] = - { - .name = _("Go-Goggles"), - .itemId = ITEM_GO_GOGGLES, - .price = 0, - .description = sGoGogglesDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_METEORITE] = - { - .name = _("Meteorite"), - .itemId = ITEM_METEORITE, - .price = 0, - .description = sMeteoriteDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_ROOM_1_KEY] = - { - .name = _("Key to Room 1"), - .itemId = ITEM_ROOM_1_KEY, - .price = 0, - .description = sRoom1KeyDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_ROOM_2_KEY] = - { - .name = _("Key to Room 2"), - .itemId = ITEM_ROOM_2_KEY, - .price = 0, - .description = sRoom2KeyDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_ROOM_4_KEY] = - { - .name = _("Key to Room 4"), - .itemId = ITEM_ROOM_4_KEY, - .price = 0, - .description = sRoom4KeyDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_ROOM_6_KEY] = - { - .name = _("Key to Room 6"), - .itemId = ITEM_ROOM_6_KEY, - .price = 0, - .description = sRoom6KeyDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_STORAGE_KEY] = - { - .name = _("Storage Key"), - .itemId = ITEM_STORAGE_KEY, - .price = 0, - .description = sStorageKeyDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_DEVON_SCOPE] = - { - .name = _("Devon Scope"), - .itemId = ITEM_DEVON_SCOPE, - .price = 0, - .description = sDevonScopeDesc, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - -// FireRed/LeafGreen - - [ITEM_OAKS_PARCEL] = - { - .name = _("Parcel"), - .itemId = ITEM_OAKS_PARCEL, - .price = 0, - .description = sOaksParcelDesc, - .importance = 2, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .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_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_BICYCLE] = - { - .name = _("Bicycle"), - .itemId = ITEM_BICYCLE, - .price = 0, - .description = sBicycleDesc, - .importance = 1, - .unk19 = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_FIELD, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_TOWN_MAP] = - { - .name = _("Town Map"), - .itemId = ITEM_TOWN_MAP, - .price = 0, - .description = sTownMapDesc, - .importance = 1, - .unk19 = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_VS_SEEKER] = - { - .name = _("Vs. Seeker"), - .itemId = ITEM_VS_SEEKER, - .price = 0, - .description = sVSSeekerDesc, - .importance = 1, - .unk19 = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_FIELD, - .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_TM_CASE] = - { - .name = _("TM Case"), - .itemId = ITEM_TM_CASE, - .price = 0, - .description = sTMCaseDesc, - .importance = 1, - .unk19 = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .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_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, - }, - - [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_MYSTIC_TICKET] = { .name = _("Mystic Ticket"), @@ -9035,60 +8890,6 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_POWDER_JAR] = - { - .name = _("Powder Jar"), - .itemId = ITEM_POWDER_JAR, - .price = 0, - .description = sPowderJarDesc, - .importance = 1, - .unk19 = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_PowderJar, - }, - - [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, - }, - -// Emerald - - [ITEM_MAGMA_EMBLEM] = - { - .name = _("Magma Emblem"), - .itemId = ITEM_MAGMA_EMBLEM, - .price = 0, - .description = sMagmaEmblemDesc, - .importance = 1, - .unk19 = 1, - .pocket = POCKET_KEY_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - [ITEM_OLD_SEA_MAP] = { .name = _("Old Sea Map"), @@ -9102,66 +8903,160 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, -// New items - - [ITEM_GRACIDEA] = + [ITEM_LETTER] = { - .name = _("Gracidea"), - .itemId = ITEM_GRACIDEA, + .name = _("Letter"), + .itemId = ITEM_LETTER, .price = 0, - .holdEffect = HOLD_EFFECT_GRACIDEA, - .description = sGracideaDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_MEGA_BRACELET] = - { - .name = _("Mega Bracelet"), - .itemId = ITEM_MEGA_BRACELET, - .price = 0, - .importance = 1, - .description = sMegaBraceletDesc, + .description = sLetterDesc, + .importance = 2, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_SHINY_CHARM] = + [ITEM_DEVON_PARTS] = { - .name = _("Shiny Charm"), - .itemId = ITEM_SHINY_CHARM, + .name = _("Devon Parts"), + .itemId = ITEM_DEVON_PARTS, .price = 0, - .importance = 1, - .description = sShinyCharmDesc, + .description = sDevonPartsDesc, + .importance = 2, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_OVAL_CHARM] = + [ITEM_GO_GOGGLES] = { - .name = _("Oval Charm"), - .itemId = ITEM_OVAL_CHARM, + .name = _("Go-Goggles"), + .itemId = ITEM_GO_GOGGLES, .price = 0, + .description = sGoGogglesDesc, .importance = 1, - .description = sOvalCharmDesc, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_Z_RING] = + [ITEM_DEVON_SCOPE] = { - .name = _("Z-Ring"), - .itemId = ITEM_Z_RING, + .name = _("Devon Scope"), + .itemId = ITEM_DEVON_SCOPE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .description = sZRingDesc, + .description = sDevonScopeDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, + + [ITEM_BASEMENT_KEY] = + { + .name = _("Basement Key"), + .itemId = ITEM_BASEMENT_KEY, + .price = 0, + .description = sBasementKeyDesc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_SCANNER] = + { + .name = _("Scanner"), + .itemId = ITEM_SCANNER, + .price = 0, + .description = sScannerDesc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_STORAGE_KEY] = + { + .name = _("Storage Key"), + .itemId = ITEM_STORAGE_KEY, + .price = 0, + .description = sStorageKeyDesc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_KEY_TO_ROOM_1] = + { + .name = _("Key to Room 1"), + .itemId = ITEM_KEY_TO_ROOM_1, + .price = 0, + .description = sKeyToRoom1Desc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_KEY_TO_ROOM_2] = + { + .name = _("Key to Room 2"), + .itemId = ITEM_KEY_TO_ROOM_2, + .price = 0, + .description = sKeyToRoom2Desc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_KEY_TO_ROOM_4] = + { + .name = _("Key to Room 4"), + .itemId = ITEM_KEY_TO_ROOM_4, + .price = 0, + .description = sKeyToRoom4Desc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_KEY_TO_ROOM_6] = + { + .name = _("Key to Room 6"), + .itemId = ITEM_KEY_TO_ROOM_6, + .price = 0, + .description = sKeyToRoom6Desc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_METEORITE] = + { + .name = _("Meteorite"), + .itemId = ITEM_METEORITE, + .price = 0, + .description = sMeteoriteDesc, + .importance = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, + + [ITEM_MAGMA_EMBLEM] = + { + .name = _("Magma Emblem"), + .itemId = ITEM_MAGMA_EMBLEM, + .price = 0, + .description = sMagmaEmblemDesc, + .importance = 1, + .unk19 = 1, + .pocket = POCKET_KEY_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 42ac81bed3..1699198d0f 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -3182,20 +3182,83 @@ static const u8 sHM08Desc[] = _( "the 1st turn, then\n" "attacks next turn."); -// Key items +// Charms +static const u8 sOvalCharmDesc[] = _( + "Raises the chance\n" + "of finding eggs\n" + "at the daycare."); + +static const u8 sShinyCharmDesc[] = _( + "A charm that will\n" + "raise the chance\n" + "of Shiny Pokémon."); + +static const u8 sCatchingCharmDesc[] = _( // Todo + "?????"); + +static const u8 sExpCharmDesc[] = _( // Todo + "?????"); + +// Form-changing Key Items +static const u8 sRotomCatalogDesc[] = _( // Todo + "?????"); + +static const u8 sGracideaDesc[] = _( + "Bouquets made with\n" + "it are offered as a\n" + "token of gratitude."); + +static const u8 sRevealGlassDesc[] = _( // Todo + "?????"); + +static const u8 sDNASplicersDesc[] = _( // Todo + "?????"); + +static const u8 sZygardeCubeDesc[] = _( // Todo + "?????"); + +static const u8 sPrisonBottleDesc[] = _( // Todo + "?????"); + +static const u8 sNSolarizerDesc[] = _( // Todo + "?????"); + +static const u8 sNLunarizerDesc[] = _( // Todo + "?????"); + +static const u8 sReinsOfUnityDesc[] = _( // Todo + "?????"); + +// Battle Mechanic Key Items +static const u8 sKeyStoneDesc[] = _( // Todo + "?????"); + +static const u8 sMegaRingDesc[] = _( + "Enables {PKMN} holding\n" + "their Mega Stone to\n" + "Mega Evolve."); + +static const u8 sZPowerRingDesc[] = _( + "A strange ring\n" + "that enables\n" + "Z-Move usage."); + +static const u8 sDynamaxBandDesc[] = _( // Todo + "?????"); + +// Misc. Key Items +static const u8 sPokemonBoxLinkDesc[] = _( // Todo + "?????"); + static const u8 sMachBikeDesc[] = _( "A folding bicycle\n" "that doubles your\n" "speed or better."); -static const u8 sCoinCaseDesc[] = _( - "A case that holds\n" - "up to 9,999 Coins."); - -static const u8 sItemfinderDesc[] = _( - "A device that\n" - "signals an invisible\n" - "item by sound."); +static const u8 sAcroBikeDesc[] = _( + "A folding bicycle\n" + "capable of jumps\n" + "and wheelies."); static const u8 sOldRodDesc[] = _( "Use by any body of\n" @@ -3212,190 +3275,50 @@ static const u8 sSuperRodDesc[] = _( "rod for catching\n" "wild Pokémon."); -static const u8 sSSTicketDesc[] = _( - "The ticket required\n" - "for sailing on a\n" - "ferry."); - -static const u8 sContestPassDesc[] = _( - "The pass required\n" - "for entering\n" - "Pokémon Contests."); - -static const u8 sWailmerPailDesc[] = _( - "A tool used for\n" - "watering Berries\n" - "and plants."); - -static const u8 sDevonGoodsDesc[] = _( - "A package that\n" - "contains Devon's\n" - "machine parts."); - -static const u8 sSootSackDesc[] = _( - "A sack used to\n" - "gather and hold\n" - "volcanic ash."); - -static const u8 sBasementKeyDesc[] = _( - "The key for New\n" - "Mauville beneath\n" - "Mauville City."); - -static const u8 sAcroBikeDesc[] = _( - "A folding bicycle\n" - "capable of jumps\n" - "and wheelies."); - -static const u8 sPokeblockCaseDesc[] = _( - "A case for holding\n" - "Pokéblocks made with\n" - "a Berry Blender."); - -static const u8 sLetterDesc[] = _( - "A letter to Steven\n" - "from the President\n" - "of the Devon Corp."); - -static const u8 sEonTicketDesc[] = _( - "The ticket for a\n" - "ferry to a distant\n" - "southern island."); - -static const u8 sScannerDesc[] = _( - "A device found\n" - "inside the\n" - "Abandoned Ship."); - -static const u8 sGoGogglesDesc[] = _( - "Nifty goggles that\n" - "protect eyes from\n" - "desert sandstorms."); - -static const u8 sMeteoriteDesc[] = _( - "A meteorite found\n" - "at Meteor Falls."); - -static const u8 sRoom1KeyDesc[] = _( - "A key that opens a\n" - "door inside the\n" - "Abandoned Ship."); - -static const u8 sRoom2KeyDesc[] = _( - "A key that opens a\n" - "door inside the\n" - "Abandoned Ship."); - -static const u8 sRoom4KeyDesc[] = _( - "A key that opens a\n" - "door inside the\n" - "Abandoned Ship."); - -static const u8 sRoom6KeyDesc[] = _( - "A key that opens a\n" - "door inside the\n" - "Abandoned Ship."); - -static const u8 sStorageKeyDesc[] = _( - "The key to the\n" - "storage inside the\n" - "Abandoned Ship."); - -static const u8 sDevonScopeDesc[] = _( - "A device by Devon\n" - "that signals any\n" - "unseeable Pokémon."); - -// FireRed/LeafGreen key items -static const u8 sOaksParcelDesc[] = _( - "A parcel for Prof.\n" - "Oak from a Pokémon\n" - "Mart's clerk."); - -static const u8 sPokeFluteDesc[] = _( - "A sweet-sounding\n" - "flute that awakens\n" - "Pokémon."); - -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 sBicycleDesc[] = _( - "A folding bicycle\n" - "that is faster than\n" - "the Running Shoes."); +static const u8 sDowsingMachineDesc[] = _( + "A device that\n" + "signals an invisible\n" + "item by sound."); static const u8 sTownMapDesc[] = _( "Can be viewed\n" "anytime. Shows your\n" "present location."); -static const u8 sVSSeekerDesc[] = _( - "A rechargeable unit\n" - "that flags battle-\n" - "ready Trainers."); +static const u8 sCoinCaseDesc[] = _( + "A case that holds\n" + "up to 9,999 Coins."); -static const u8 sFameCheckerDesc[] = _( - "Stores information\n" - "on famous people\n" - "for instant recall."); +static const u8 sPowderJarDesc[] = _( + "Stores Berry\n" + "Powder made using\n" + "a Berry Crusher."); -static const u8 sTMCaseDesc[] = _( - "A convenient case \n" - "that holds TMs and\n" - "HMs."); +static const u8 sWailmerPailDesc[] = _( + "A tool used for\n" + "watering Berries\n" + "and plants."); -static const u8 sBerryPouchDesc[] = _( - "A convenient\n" - "container that\n" - "holds Berries."); +static const u8 sPokeblockCaseDesc[] = _( + "A case for holding\n" + "Pokéblocks made with\n" + "a Berry Blender."); -static const u8 sTeachyTVDesc[] = _( - "A TV set tuned to\n" - "an advice program\n" - "for Trainers."); +static const u8 sSootSackDesc[] = _( + "A sack used to\n" + "gather and hold\n" + "volcanic ash."); -static const u8 sTriPassDesc[] = _( - "A pass for ferries\n" - "between One, Two,\n" - "and Three Island."); +// Story Key Items +static const u8 sSSTicketDesc[] = _( + "The ticket required\n" + "for sailing on a\n" + "ferry."); -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 sEonTicketDesc[] = _( + "The ticket for a\n" + "ferry to a distant\n" + "southern island."); static const u8 sMysticTicketDesc[] = _( "A ticket required\n" @@ -3407,54 +3330,71 @@ static const u8 sAuroraTicketDesc[] = _( "to board the ship\n" "to Birth Island."); -static const u8 sPowderJarDesc[] = _( - "Stores Berry\n" - "Powder made using\n" - "a Berry Crusher."); - -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."); - -// Emerald-specific key items -static const u8 sMagmaEmblemDesc[] = _( - "A medal-like item in\n" - "the same shape as\n" - "Team Magma's mark."); - static const u8 sOldSeaMapDesc[] = _( "A faded sea chart\n" "that shows the way\n" "to a certain island."); - // New items -static const u8 sGracideaDesc[] = _( - "Bouquets made with\n" - "it are offered as a\n" - "token of gratitude."); +static const u8 sLetterDesc[] = _( + "A letter to Steven\n" + "from the President\n" + "of the Devon Corp."); -static const u8 sShinyCharmDesc[] = _( - "A charm that will\n" - "raise the chance\n" - "of Shiny Pokémon."); +static const u8 sDevonPartsDesc[] = _( + "A package that\n" + "contains Devon's\n" + "machine parts."); -static const u8 sOvalCharmDesc[] = _( - "Raises the chance\n" - "of finding eggs\n" - "at the daycare."); +static const u8 sGoGogglesDesc[] = _( + "Nifty goggles that\n" + "protect eyes from\n" + "desert sandstorms."); -static const u8 sMegaBraceletDesc[] = _( - "Enables {PKMN} holding\n" - "their Mega Stone to\n" - "Mega Evolve."); +static const u8 sDevonScopeDesc[] = _( + "A device by Devon\n" + "that signals any\n" + "unseeable Pokémon."); -static const u8 sZRingDesc[] = _( - "A strange ring\n" - "that enables\n" - "Z-Move usage."); +static const u8 sBasementKeyDesc[] = _( + "The key for New\n" + "Mauville beneath\n" + "Mauville City."); + +static const u8 sScannerDesc[] = _( + "A device found\n" + "inside the\n" + "Abandoned Ship."); + +static const u8 sStorageKeyDesc[] = _( + "The key to the\n" + "storage inside the\n" + "Abandoned Ship."); + +static const u8 sKeyToRoom1Desc[] = _( + "A key that opens a\n" + "door inside the\n" + "Abandoned Ship."); + +static const u8 sKeyToRoom2Desc[] = _( + "A key that opens a\n" + "door inside the\n" + "Abandoned Ship."); + +static const u8 sKeyToRoom4Desc[] = _( + "A key that opens a\n" + "door inside the\n" + "Abandoned Ship."); + +static const u8 sKeyToRoom6Desc[] = _( + "A key that opens a\n" + "door inside the\n" + "Abandoned Ship."); + +static const u8 sMeteoriteDesc[] = _( + "A meteorite found\n" + "at Meteor Falls."); + +static const u8 sMagmaEmblemDesc[] = _( + "A medal-like item in\n" + "the same shape as\n" + "Team Magma's mark.");