Merge pull request #194 from BuffelSaft/bottle-caps

More Bottle Caps
BuffelSaft · Sep 3, 2021 · e480e83 · e480e83
2 parents 8016b2c + c8500de
commit e480e83
Show file tree

Hide file tree

Showing 18 changed files with 125 additions and 97 deletions.
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
@@ -514,8 +514,8 @@
       "x": 36,
       "y": 31,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_BOTTLE_CAP"
     },
     {
       "type": "hidden_item",

diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
@@ -34,7 +34,13 @@ LilycoveCity_DepartmentStore_2F_Pokemart1: @ 821FB60
 	.2byte ITEM_REPEAT_BALL
 	.2byte ITEM_NEST_BALL
 	.2byte ITEM_LUXURY_BALL
-	.2byte ITEM_PREMIER_BALL
+    .2byte ITEM_FAST_BALL
+    .2byte ITEM_LEVEL_BALL
+    .2byte ITEM_LURE_BALL
+    .2byte ITEM_HEAVY_BALL
+    .2byte ITEM_LOVE_BALL
+    .2byte ITEM_FRIEND_BALL
+    .2byte ITEM_MOON_BALL
 	.2byte ITEM_FLUFFY_TAIL
 	.2byte ITEM_NONE
 	release

diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
@@ -620,8 +620,8 @@
       "x": 16,
       "y": 64,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_BOTTLE_CAP"
     }
   ]
 }
diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json
@@ -153,8 +153,8 @@
       "x": 15,
       "y": 68,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BOTTLE_CAP"
     },
     {
       "type": "hidden_item",

diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json
@@ -419,8 +419,8 @@
       "x": 33,
       "y": 5,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_1"
     },
     {
       "type": "hidden_item",
@@ -443,32 +443,32 @@
       "x": 13,
       "y": 16,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_2"
     },
     {
       "type": "hidden_item",
       "x": 8,
       "y": 42,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_3"
     },
     {
       "type": "hidden_item",
       "x": 31,
       "y": 11,
       "elevation": 3,
       "item": "ITEM_BOTTLE_CAP",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE109_BOTTLE_CAP1"
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_4"
     },
     {
       "type": "hidden_item",
       "x": 21,
       "y": 14,
-      "elevation": 3,
+      "elevation": 4,
       "item": "ITEM_BOTTLE_CAP",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE109_BOTTLE_CAP2"
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_5"
     }
   ]
 }
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
@@ -457,8 +457,8 @@
       "x": 15,
       "y": 49,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_BOTTLE_CAP"
     },
     {
       "type": "hidden_item",

diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
@@ -414,8 +414,8 @@
       "x": 12,
       "y": 14,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_BOTTLE_CAP"
     }
   ]
 }
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
@@ -174,24 +174,24 @@
       "x": 49,
       "y": 9,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_BOTTLE_CAP_1"
     },
     {
       "type": "hidden_item",
       "x": 57,
       "y": 21,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_BOTTLE_CAP_2"
     },
     {
       "type": "hidden_item",
       "x": 31,
       "y": 33,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_BOTTLE_CAP_3"
     }
   ]
 }
diff --git a/data/maps/SandstrewnRuins_B1F/map.json b/data/maps/SandstrewnRuins_B1F/map.json
@@ -36,6 +36,37 @@
 
   ],
   "bg_events": [
-
+    {
+      "type": "hidden_item",
+      "x": 13,
+      "y": 2,
+      "elevation": 3,
+      "item": "ITEM_RED_SHARD",
+      "flag": "FLAG_HIDDEN_ITEM_SANDSTREWN_RUINS_RED_SHARD"
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_GREEN_SHARD",
+      "flag": "FLAG_HIDDEN_ITEM_SANDSTREWN_RUINS_GREEN_SHARD"
+    },
+    {
+      "type": "hidden_item",
+      "x": 22,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_BLUE_SHARD",
+      "flag": "FLAG_HIDDEN_ITEM_SANDSTREWN_RUINS_BLUE_SHARD"
+    },
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 7,
+      "elevation": 3,
+      "item": "ITEM_YELLOW_SHARD",
+      "flag": "FLAG_HIDDEN_ITEM_SANDSTREWN_RUINS_YELLOW_SHARD"
+    }
   ]
 }
diff --git a/data/maps/Underwater_Route124/map.json b/data/maps/Underwater_Route124/map.json
@@ -71,8 +71,8 @@
       "x": 70,
       "y": 64,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_BOTTLE_CAP_1"
     },
     {
       "type": "hidden_item",
@@ -87,8 +87,8 @@
       "x": 45,
       "y": 36,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_BOTTLE_CAP_2"
     },
     {
       "type": "hidden_item",

diff --git a/data/maps/Underwater_Route126/map.json b/data/maps/Underwater_Route126/map.json
@@ -50,8 +50,8 @@
       "x": 30,
       "y": 17,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BOTTLE_CAP"
     },
     {
       "type": "hidden_item",

diff --git a/data/maps/Underwater_Route127/map.json b/data/maps/Underwater_Route127/map.json
@@ -73,8 +73,8 @@
       "x": 34,
       "y": 72,
       "elevation": 3,
-      "item": "ITEM_HEART_SCALE",
-      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE"
+      "item": "ITEM_BOTTLE_CAP",
+      "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_BOTTLE_CAP"
     },
     {
       "type": "hidden_item",

diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
@@ -260,7 +260,7 @@ EventScript_RockSmashEncounter::
 	end
 
 EventScript_RockSmashItem::
-	random 11
+	random 12
 	switch VAR_RESULT
 	case 0, EventScript_RockSmashPearl
 	case 1, EventScript_RockSmashBigPearl
@@ -273,6 +273,7 @@ EventScript_RockSmashItem::
 	case 8, EventScript_RockSmashStarPiece
 	case 9, EventScript_RockSmashGem
 	case 10, EventScript_RockSmashFossil
+	case 11, EventScript_RockSmashBottleCap
 	releaseall
 	end
 
@@ -337,6 +338,11 @@ EventScript_RockSmashFossil::
 	releaseall
 	end
 
+EventScript_RockSmashBottleCap::
+	finditem ITEM_BOTTLE_CAP
+	releaseall
+	end
+
 EventScript_RockSmashOldAmber::
 	finditem ITEM_OLD_AMBER
 	releaseall

diff --git a/include/constants/flags.h b/include/constants/flags.h
@@ -541,14 +541,14 @@
 #define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS                    (FLAG_HIDDEN_ITEMS_START + 0x04)
 #define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM                   (FLAG_HIDDEN_ITEMS_START + 0x05)
 #define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL                (FLAG_HIDDEN_ITEMS_START + 0x06)
-#define FLAG_HIDDEN_ITEM_ROUTE_123_BLACK_SLUDGE               (FLAG_HIDDEN_ITEMS_START + 0x07)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_BLACK_SLUDGE              (FLAG_HIDDEN_ITEMS_START + 0x07)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS               (FLAG_HIDDEN_ITEMS_START + 0x08)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD          (FLAG_HIDDEN_ITEMS_START + 0x09)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x0A)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL            (FLAG_HIDDEN_ITEMS_START + 0x0B)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD           (FLAG_HIDDEN_ITEMS_START + 0x0C)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1        (FLAG_HIDDEN_ITEMS_START + 0x0D)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE          (FLAG_HIDDEN_ITEMS_START + 0x0E)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_BOTTLE_CAP_1         (FLAG_HIDDEN_ITEMS_START + 0x0D)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BOTTLE_CAP           (FLAG_HIDDEN_ITEMS_START + 0x0E)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL           (FLAG_HIDDEN_ITEMS_START + 0x0F)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST             (FLAG_HIDDEN_ITEMS_START + 0x10)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x11)
@@ -557,11 +557,11 @@
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL            (FLAG_HIDDEN_ITEMS_START + 0x14)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE           (FLAG_HIDDEN_ITEMS_START + 0x15)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP                (FLAG_HIDDEN_ITEMS_START + 0x16)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE          (FLAG_HIDDEN_ITEMS_START + 0x17)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_127_BOTTLE_CAP           (FLAG_HIDDEN_ITEMS_START + 0x17)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD            (FLAG_HIDDEN_ITEMS_START + 0x18)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN              (FLAG_HIDDEN_ITEMS_START + 0x19)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x1A)
-#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE           (FLAG_HIDDEN_ITEMS_START + 0x1B)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_BOTTLE_CAP            (FLAG_HIDDEN_ITEMS_START + 0x1B)
 #define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET               (FLAG_HIDDEN_ITEMS_START + 0x1C)
 #define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL         (FLAG_HIDDEN_ITEMS_START + 0x1D)
 #define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32                     (FLAG_HIDDEN_ITEMS_START + 0x1E)
@@ -572,7 +572,7 @@
 #define FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS       (FLAG_HIDDEN_ITEMS_START + 0x23)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM              (FLAG_HIDDEN_ITEMS_START + 0x24)
 #define FLAG_HIDDEN_ITEM_ROUTE_104_POTION                    (FLAG_HIDDEN_ITEMS_START + 0x25)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2        (FLAG_HIDDEN_ITEMS_START + 0x26)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_BOTTLE_CAP_2         (FLAG_HIDDEN_ITEMS_START + 0x26)
 #define FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP                     (FLAG_HIDDEN_ITEMS_START + 0x27)
 #define FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET                    (FLAG_HIDDEN_ITEMS_START + 0x28)
 #define FLAG_HIDDEN_ITEM_ROUTE_123_FOCUS_SASH                (FLAG_HIDDEN_ITEMS_START + 0x29)
@@ -586,7 +586,7 @@
 #define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2        (FLAG_HIDDEN_ITEMS_START + 0x31)
 #define FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x32)
 #define FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL                (FLAG_HIDDEN_ITEMS_START + 0x33)
-#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1             (FLAG_HIDDEN_ITEMS_START + 0x34)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_1              (FLAG_HIDDEN_ITEMS_START + 0x34)
 #define FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL                (FLAG_HIDDEN_ITEMS_START + 0x35)
 #define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x36)
 #define FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL                 (FLAG_HIDDEN_ITEMS_START + 0x37)
@@ -600,7 +600,7 @@
 #define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL                 (FLAG_HIDDEN_ITEMS_START + 0x3F)
 #define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER                     (FLAG_HIDDEN_ITEMS_START + 0x40)
 #define FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL                 (FLAG_HIDDEN_ITEMS_START + 0x41)
-#define FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x42)
+#define FLAG_HIDDEN_ITEM_ROUTE_118_BOTTLE_CAP                (FLAG_HIDDEN_ITEMS_START + 0x42)
 #define FLAG_HIDDEN_ITEM_ROUTE_118_IRON                      (FLAG_HIDDEN_ITEMS_START + 0x43)
 #define FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL                 (FLAG_HIDDEN_ITEMS_START + 0x44)
 #define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2              (FLAG_HIDDEN_ITEMS_START + 0x45)
@@ -609,7 +609,7 @@
 #define FLAG_HIDDEN_ITEM_ROUTE_117_BRIGHT_POWDER             (FLAG_HIDDEN_ITEMS_START + 0x48)
 #define FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL                 (FLAG_HIDDEN_ITEMS_START + 0x49)
 #define FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION              (FLAG_HIDDEN_ITEMS_START + 0x4A)
-#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_DREAM_BALL             (FLAG_HIDDEN_ITEMS_START + 0x4B)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_DREAM_BALL            (FLAG_HIDDEN_ITEMS_START + 0x4B)
 #define FLAG_HIDDEN_ITEM_JAGGED_PASS_LEVEL_BALL              (FLAG_HIDDEN_ITEMS_START + 0x4C)
 #define FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL               (FLAG_HIDDEN_ITEMS_START + 0x4D)
 #define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER          (FLAG_HIDDEN_ITEMS_START + 0x4E)
@@ -622,16 +622,16 @@
 #define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE                  (FLAG_HIDDEN_ITEMS_START + 0x55)
 #define FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY                (FLAG_HIDDEN_ITEMS_START + 0x56)
 #define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER                 (FLAG_HIDDEN_ITEMS_START + 0x57)
-#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x58)
-#define FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x59)
-#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2             (FLAG_HIDDEN_ITEMS_START + 0x5A)
-#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3             (FLAG_HIDDEN_ITEMS_START + 0x5B)
-#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1             (FLAG_HIDDEN_ITEMS_START + 0x5C)
-#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2             (FLAG_HIDDEN_ITEMS_START + 0x5D)
-#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3             (FLAG_HIDDEN_ITEMS_START + 0x5E)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_BOTTLE_CAP                (FLAG_HIDDEN_ITEMS_START + 0x58)
+#define FLAG_HIDDEN_ITEM_ROUTE_105_BOTTLE_CAP                (FLAG_HIDDEN_ITEMS_START + 0x59)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_2              (FLAG_HIDDEN_ITEMS_START + 0x5A)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_3              (FLAG_HIDDEN_ITEMS_START + 0x5B)
+#define FLAG_HIDDEN_ITEM_ROUTE_128_BOTTLE_CAP_1              (FLAG_HIDDEN_ITEMS_START + 0x5C)
+#define FLAG_HIDDEN_ITEM_ROUTE_128_BOTTLE_CAP_2              (FLAG_HIDDEN_ITEMS_START + 0x5D)
+#define FLAG_HIDDEN_ITEM_ROUTE_128_BOTTLE_CAP_3              (FLAG_HIDDEN_ITEMS_START + 0x5E)
 #define FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY           (FLAG_HIDDEN_ITEMS_START + 0x5F)
 #define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES             (FLAG_HIDDEN_ITEMS_START + 0x60)
-#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x61)
+#define FLAG_HIDDEN_ITEM_ROUTE_115_BOTTLE_CAP                (FLAG_HIDDEN_ITEMS_START + 0x61)
 #define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET                    (FLAG_HIDDEN_ITEMS_START + 0x62)
 #define FLAG_HIDDEN_ITEM_ROUTE_123_PP_MAX                    (FLAG_HIDDEN_ITEMS_START + 0x63)
 #define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE                (FLAG_HIDDEN_ITEMS_START + 0x64)
@@ -676,19 +676,19 @@
 #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_ROOMS_B1F_BOTTLE_CAP (FLAG_HIDDEN_ITEMS_START + 0x89)
 #define FLAG_HIDDEN_ITEM_CABLECAR_STATION_BOTTLE_CAP         (FLAG_HIDDEN_ITEMS_START + 0x8A)
 #define FLAG_HIDDEN_ITEM_ROUTE110_BOTTLE_CAP                 (FLAG_HIDDEN_ITEMS_START + 0x8B)
-#define FLAG_HIDDEN_ITEM_ROUTE109_BOTTLE_CAP1                (FLAG_HIDDEN_ITEMS_START + 0x8C)
-#define FLAG_HIDDEN_ITEM_ROUTE109_BOTTLE_CAP2                (FLAG_HIDDEN_ITEMS_START + 0x8D)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_4              (FLAG_HIDDEN_ITEMS_START + 0x8C)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_BOTTLE_CAP_5              (FLAG_HIDDEN_ITEMS_START + 0x8D)
 #define FLAG_HIDDEN_ITEM_RUSTBORO_CITY_BOTTLE_CAP            (FLAG_HIDDEN_ITEMS_START + 0x8E)
 #define FLAG_HIDDEN_ITEM_GAME_CORNER_BOTTLE_CAP1             (FLAG_HIDDEN_ITEMS_START + 0x8F)
 #define FLAG_HIDDEN_ITEM_GAME_CORNER_BOTTLE_CAP2             (FLAG_HIDDEN_ITEMS_START + 0x90)
 #define FLAG_HIDDEN_ITEM_MOSSDEEP_CITY_BOTTLE_CAP            (FLAG_HIDDEN_ITEMS_START + 0x91)
 #define FLAG_HIDDEN_ITEM_DEWFORD_MEADOW_GRASS_GEM            (FLAG_HIDDEN_ITEMS_START + 0x92)
 #define FLAG_HIDDEN_ITEM_DEWFORD_MEADOW_FAIRY_GEM            (FLAG_HIDDEN_ITEMS_START + 0x93)
 #define FLAG_HIDDEN_ITEM_JIRACHIS_ROOM_COMET_SHARD           (FLAG_HIDDEN_ITEMS_START + 0x94)
-#define FLAG_UNUSED_0x28B  0x28B // Unused Flag
-#define FLAG_UNUSED_0x28C  0x28C // Unused Flag
-#define FLAG_UNUSED_0x28D  0x28D // Unused Flag
-#define FLAG_UNUSED_0x28E  0x28E // Unused Flag
+#define FLAG_HIDDEN_ITEM_SANDSTREWN_RUINS_RED_SHARD          (FLAG_HIDDEN_ITEMS_START + 0x95)
+#define FLAG_HIDDEN_ITEM_SANDSTREWN_RUINS_GREEN_SHARD        (FLAG_HIDDEN_ITEMS_START + 0x96)
+#define FLAG_HIDDEN_ITEM_SANDSTREWN_RUINS_BLUE_SHARD         (FLAG_HIDDEN_ITEMS_START + 0x97)
+#define FLAG_HIDDEN_ITEM_SANDSTREWN_RUINS_YELLOW_SHARD       (FLAG_HIDDEN_ITEMS_START + 0x98)
 #define FLAG_UNUSED_0x28F  0x28F // Unused Flag
 #define FLAG_UNUSED_0x290  0x290 // Unused Flag
 #define FLAG_UNUSED_0x291  0x291 // Unused Flag