Removed Redundant Key Stone item

include/constants/items.h

@@ -868,68 +868,67 @@
 #define ITEM_REINS_OF_UNITY 702
 
 // Battle Mechanic Key Items
-#define ITEM_KEY_STONE 703
-#define ITEM_MEGA_RING 704
-#define ITEM_Z_POWER_RING 705
-#define ITEM_DYNAMAX_BAND 706
+#define ITEM_MEGA_RING 703
+#define ITEM_Z_POWER_RING 704
+#define ITEM_DYNAMAX_BAND 705
 
 // Misc. Key Items
-#define ITEM_BICYCLE 707
-#define ITEM_MACH_BIKE 708
-#define ITEM_ACRO_BIKE 709
-#define ITEM_OLD_ROD 710
-#define ITEM_GOOD_ROD 711
-#define ITEM_SUPER_ROD 712
-#define ITEM_DOWSING_MACHINE 713
-#define ITEM_TOWN_MAP 714
-#define ITEM_VS_SEEKER 715
-#define ITEM_TM_CASE 716
-#define ITEM_BERRY_POUCH 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_POKE_FLUTE 725
-#define ITEM_FAME_CHECKER 726
-#define ITEM_TEACHY_TV 727
+#define ITEM_BICYCLE 706
+#define ITEM_MACH_BIKE 707
+#define ITEM_ACRO_BIKE 708
+#define ITEM_OLD_ROD 709
+#define ITEM_GOOD_ROD 710
+#define ITEM_SUPER_ROD 711
+#define ITEM_DOWSING_MACHINE 712
+#define ITEM_TOWN_MAP 713
+#define ITEM_VS_SEEKER 714
+#define ITEM_TM_CASE 715
+#define ITEM_BERRY_POUCH 716
+#define ITEM_POKEMON_BOX_LINK 717
+#define ITEM_COIN_CASE 718
+#define ITEM_POWDER_JAR 719
+#define ITEM_WAILMER_PAIL 720
+#define ITEM_POKE_RADAR 721
+#define ITEM_POKEBLOCK_CASE 722
+#define ITEM_SOOT_SACK 723
+#define ITEM_POKE_FLUTE 724
+#define ITEM_FAME_CHECKER 725
+#define ITEM_TEACHY_TV 726
 
 // Story Key Items
-#define ITEM_SS_TICKET 728
-#define ITEM_EON_TICKET 729
-#define ITEM_MYSTIC_TICKET 730
-#define ITEM_AURORA_TICKET 731
-#define ITEM_OLD_SEA_MAP 732
-#define ITEM_LETTER 733
-#define ITEM_DEVON_PARTS 734
-#define ITEM_GO_GOGGLES 735
-#define ITEM_DEVON_SCOPE 736
-#define ITEM_BASEMENT_KEY 737
-#define ITEM_SCANNER 738
-#define ITEM_STORAGE_KEY 739
-#define ITEM_KEY_TO_ROOM_1 740
-#define ITEM_KEY_TO_ROOM_2 741
-#define ITEM_KEY_TO_ROOM_4 742
-#define ITEM_KEY_TO_ROOM_6 743
-#define ITEM_METEORITE 744
-#define ITEM_MAGMA_EMBLEM 745
-#define ITEM_CONTEST_PASS 746
-#define ITEM_OAKS_PARCEL 747
-#define ITEM_SECRET_KEY 748
-#define ITEM_BIKE_VOUCHER 749
-#define ITEM_GOLD_TEETH 750
-#define ITEM_CARD_KEY 751
-#define ITEM_LIFT_KEY 752
-#define ITEM_SILPH_SCOPE 753
-#define ITEM_TRI_PASS 754
-#define ITEM_RAINBOW_PASS 755
-#define ITEM_TEA 756
-#define ITEM_RUBY 757
-#define ITEM_SAPPHIRE 758
+#define ITEM_SS_TICKET 727
+#define ITEM_EON_TICKET 728
+#define ITEM_MYSTIC_TICKET 729
+#define ITEM_AURORA_TICKET 730
+#define ITEM_OLD_SEA_MAP 731
+#define ITEM_LETTER 732
+#define ITEM_DEVON_PARTS 733
+#define ITEM_GO_GOGGLES 734
+#define ITEM_DEVON_SCOPE 735
+#define ITEM_BASEMENT_KEY 736
+#define ITEM_SCANNER 737
+#define ITEM_STORAGE_KEY 738
+#define ITEM_KEY_TO_ROOM_1 739
+#define ITEM_KEY_TO_ROOM_2 740
+#define ITEM_KEY_TO_ROOM_4 741
+#define ITEM_KEY_TO_ROOM_6 742
+#define ITEM_METEORITE 743
+#define ITEM_MAGMA_EMBLEM 744
+#define ITEM_CONTEST_PASS 745
+#define ITEM_OAKS_PARCEL 746
+#define ITEM_SECRET_KEY 747
+#define ITEM_BIKE_VOUCHER 748
+#define ITEM_GOLD_TEETH 749
+#define ITEM_CARD_KEY 750
+#define ITEM_LIFT_KEY 751
+#define ITEM_SILPH_SCOPE 752
+#define ITEM_TRI_PASS 753
+#define ITEM_RAINBOW_PASS 754
+#define ITEM_TEA 755
+#define ITEM_RUBY 756
+#define ITEM_SAPPHIRE 757
 
-#define ITEMS_COUNT 759
+#define ITEMS_COUNT 758
 #define ITEM_FIELD_ARROW ITEMS_COUNT
 
 // Range of berries given out by various NPCS

include/graphics.h

@@ -4600,8 +4600,6 @@ extern const u32 gItemIconPalette_Gracidea[];
 //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[];

src/data/graphics/items.h

@@ -1870,9 +1870,6 @@ const u32 gItemIconPalette_Gracidea[] = INCBIN_U32("graphics/items/icon_palettes
 
 // 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");
 

src/data/item_icon_table.h

@@ -746,7 +746,6 @@ const u32 *const gItemIconTable[][2] =
     [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

src/data/items.h

@@ -8655,17 +8655,6 @@ const struct Item gItems[] =
 
 // 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"),

src/data/text/item_descriptions.h

@@ -3315,9 +3315,6 @@ 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"