Fully enumerate secret base constants

14 files changed, 180 insertions, 99 deletions

diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
index 229573076..436b44e56 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/events/Route110.inc
@@ -53,8 +53,8 @@ Route110_MapBGEvents:: @ 83820C0
 	bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD
 	bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8
 	bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A
-	bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3(1)
-	bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4(1)
+	bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1
+	bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1
 	bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13
 	bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C
 	bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25
diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc
index 1725e7ff6..ef205af37 100644
--- a/data/maps/events/Route111.inc
+++ b/data/maps/events/Route111.inc
@@ -82,17 +82,17 @@ Route111_MapBGEvents:: @ 8382738
 	bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F
 	bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371
 	bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A
-	bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2(1)
-	bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3(1)
-	bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1(1)
+	bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1
+	bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1
+	bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1
 	bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383
-	bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2(3)
-	bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4(3)
+	bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3
+	bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3
 	bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2
-	bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4(3)
+	bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3
 	bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C
-	bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1(4)
-	bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1(1)
+	bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4
+	bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1
 	bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38
 	bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39
 
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
index 0f69b0547..dccaf6e82 100644
--- a/data/maps/events/Route113.inc
+++ b/data/maps/events/Route113.inc
@@ -40,7 +40,7 @@ Route113_MapBGEvents:: @ 8382BE0
 	bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620
 	bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632
 	bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629
-	bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1(3)
+	bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3
 	bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3
 	bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_1E
 
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
index 709714072..0687dc0e9 100644
--- a/data/maps/events/Route114.inc
+++ b/data/maps/events/Route114.inc
@@ -31,15 +31,15 @@ Route114_MapWarps:: @ 8382E70
 Route114_MapBGEvents:: @ 8382E88
 	bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6
 	bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF
-	bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1(1)
-	bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2(1)
-	bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3(1)
-	bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4(1)
-	bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3(2)
-	bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4(2)
+	bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1
+	bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1
+	bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1
+	bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1
+	bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2
+	bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2
 	bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8
 	bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4
-	bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4(3)
+	bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3
 	bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A
 
 Route114_MapEvents:: @ 8382F18
diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc
index b19ef6009..157dd82eb 100644
--- a/data/maps/events/Route115.inc
+++ b/data/maps/events/Route115.inc
@@ -20,19 +20,19 @@ Route115_MapWarps:: @ 83830AC
 	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
 
 Route115_MapBGEvents:: @ 83830B4
-	bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4(2)
-	bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3(2)
+	bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2
+	bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2
 	bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937
 	bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940
-	bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2(3)
-	bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1(2)
-	bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2(2)
-	bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1(3)
-	bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2(3)
-	bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2(4)
-	bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3(3)
-	bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3(3)
-	bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3(1)
+	bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3
+	bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2
+	bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2
+	bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3
+	bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3
+	bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4
+	bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3
+	bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3
+	bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1
 	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_61
 
 Route115_MapEvents:: @ 838315C
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
index ff5a842f7..ef301e51d 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/events/Route116.inc
@@ -34,12 +34,12 @@ Route116_MapBGEvents:: @ 83833A8
 	bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30
 	bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39
 	bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42
-	bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1(1)
-	bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2(1)
+	bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1
+	bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1
 	bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B
 	bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54
-	bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3(2)
-	bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4(2)
+	bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2
+	bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2
 	bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D
 	bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_60
 
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
index 3c16827a7..4d4e3ea9a 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/events/Route118.inc
@@ -26,13 +26,13 @@ Route118_MapCoordEvents:: @ 8383864
 	coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4
 
 Route118_MapBGEvents:: @ 8383894
-	bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1(1)
+	bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1
 	bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C
 	bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5
-	bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2(1)
-	bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1(2)
-	bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1(3)
-	bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2(1)
+	bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1
+	bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2
+	bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3
+	bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1
 	bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_43
 	bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42
 
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
index b26f6685e..2abacdf27 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/events/Route119.inc
@@ -71,21 +71,21 @@ Route119_MapCoordEvents:: @ 8383C9C
 Route119_MapBGEvents:: @ 8383E2C
 	bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C
 	bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423
-	bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1(1)
-	bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1(2)
-	bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2(1)
-	bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2(2)
-	bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3(1)
-	bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4(1)
-	bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3(3)
-	bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4(3)
+	bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1
+	bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2
+	bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1
+	bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2
+	bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1
+	bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1
+	bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3
+	bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3
 	bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_5
 	bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_6
-	bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3(3)
-	bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2(3)
-	bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4(3)
-	bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3(3)
-	bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4(3)
+	bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3
+	bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3
+	bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3
+	bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3
+	bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3
 	bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44
 	bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57
 	bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
index 909882c2d..ac0e527c7 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/events/Route120.inc
@@ -69,18 +69,18 @@ Route120_MapCoordEvents:: @ 8384318
 Route120_MapBGEvents:: @ 8384448
 	bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1
 	bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA
-	bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3(1)
-	bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4(1)
-	bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3(2)
-	bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4(2)
-	bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2(3)
-	bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1(3)
-	bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2(3)
+	bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1
+	bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1
+	bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2
+	bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2
+	bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3
+	bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3
+	bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3
 	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_47
 	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_54
 	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_45
 	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_46
-	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1(4)
+	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
 
 Route120_MapEvents:: @ 83844F0
 	map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
index f6f0b8962..e799115e5 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/events/Route121.inc
@@ -33,10 +33,10 @@ Route121_MapCoordEvents:: @ 838471C
 
 Route121_MapBGEvents:: @ 838475C
 	bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13
-	bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2(2)
-	bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3(2)
-	bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1(2)
-	bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2(2)
+	bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2
+	bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2
+	bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2
+	bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2
 	bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C
 	bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27
 	bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28
diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc
index a52b927fc..3c50254cb 100644
--- a/data/maps/events/Route123.inc
+++ b/data/maps/events/Route123.inc
@@ -63,12 +63,12 @@ Route123_MapCoordEvents:: @ 8384B30
 
 Route123_MapBGEvents:: @ 8384C90
 	bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF
-	bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1(2)
-	bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2(2)
+	bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2
+	bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2
 	bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6
 	bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7
 	bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8
-	bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1(3)
+	bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3
 	bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29
 	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A
 
diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc
index 860992732..82767393d 100644
--- a/data/maps/events/Route125.inc
+++ b/data/maps/events/Route125.inc
@@ -11,10 +11,10 @@ Route125_MapWarps:: @ 8384ED0
 	warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
 
 Route125_MapBGEvents:: @ 8384ED8
-	bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1(2)
-	bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4(2)
-	bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2(2)
-	bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4(2)
+	bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2
+	bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2
+	bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2
+	bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2
 
 Route125_MapEvents:: @ 8384F08
 	map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc
index 5d4d7623a..6b3d396c9 100644
--- a/data/maps/events/Route127.inc
+++ b/data/maps/events/Route127.inc
@@ -10,11 +10,11 @@ Route127_MapObjects:: @ 8384FA8
 	object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 63, 0, 63, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route127_EventScript_1520ED, 0, 0, 0
 
 Route127_MapBGEvents:: @ 8385080
-	bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4(1)
-	bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3(2)
-	bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4(1)
-	bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3(3)
-	bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1(3)
+	bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1
+	bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2
+	bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1
+	bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3
+	bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3
 
 Route127_MapEvents:: @ 83850BC
 	map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents
diff --git a/include/constants/secret_bases.h b/include/constants/secret_bases.h
index f9748183c..0f51054a8 100644
--- a/include/constants/secret_bases.h
+++ b/include/constants/secret_bases.h
@@ -1,29 +1,110 @@
 #ifndef GUARD_CONSTANTS_SECRET_BASES_H
 #define GUARD_CONSTANTS_SECRET_BASES_H
 
-#define SECRET_BASE_RED_CAVE1(n)    (0 + n)
-#define SECRET_BASE_RED_CAVE2(n)    (10 + n)
-#define SECRET_BASE_RED_CAVE3(n)    (20 + n)
-#define SECRET_BASE_RED_CAVE4(n)    (30 + n)
-#define SECRET_BASE_BROWN_CAVE1(n)  (40 + n)
-#define SECRET_BASE_BROWN_CAVE2(n)  (50 + n)
-#define SECRET_BASE_BROWN_CAVE3(n)  (60 + n)
-#define SECRET_BASE_BROWN_CAVE4(n)  (70 + n)
-#define SECRET_BASE_BLUE_CAVE1(n)   (80 + n)
-#define SECRET_BASE_BLUE_CAVE2(n)   (90 + n)
-#define SECRET_BASE_BLUE_CAVE3(n)   (100 + n)
-#define SECRET_BASE_BLUE_CAVE4(n)   (110 + n)
-#define SECRET_BASE_YELLOW_CAVE1(n) (120 + n)
-#define SECRET_BASE_YELLOW_CAVE2(n) (130 + n)
-#define SECRET_BASE_YELLOW_CAVE3(n) (140 + n)
-#define SECRET_BASE_YELLOW_CAVE4(n) (150 + n)
-#define SECRET_BASE_TREE1(n)        (160 + n)
-#define SECRET_BASE_TREE2(n)        (170 + n)
-#define SECRET_BASE_TREE3(n)        (180 + n)
-#define SECRET_BASE_TREE4(n)        (190 + n)
-#define SECRET_BASE_SHRUB1(n)       (200 + n)
-#define SECRET_BASE_SHRUB2(n)       (210 + n)
-#define SECRET_BASE_SHRUB3(n)       (220 + n)
-#define SECRET_BASE_SHRUB4(n)       (230 + n)
+// Each secret base location is assigned an identifier value.
+// The secret base's map is determined by (id / 10). The ones
+// digit is used to differentiate secret bases using the same map.
+// Therefore, each secret base map can be used by up to 10 different
+// secret bases in the game. These ids are 1-based, but there is no
+// apparent reason for that.
+
+#define SECRET_BASE_RED_CAVE1_1     1
+#define SECRET_BASE_RED_CAVE1_2     2
+#define SECRET_BASE_RED_CAVE1_3     3
+
+#define SECRET_BASE_RED_CAVE2_1     11
+#define SECRET_BASE_RED_CAVE2_2     12
+#define SECRET_BASE_RED_CAVE2_3     13
+
+#define SECRET_BASE_RED_CAVE3_1     21
+#define SECRET_BASE_RED_CAVE3_2     22
+#define SECRET_BASE_RED_CAVE3_3     23
+
+#define SECRET_BASE_RED_CAVE4_1     31
+#define SECRET_BASE_RED_CAVE4_2     32
+#define SECRET_BASE_RED_CAVE4_3     33
+
+#define SECRET_BASE_BROWN_CAVE1_1   41
+#define SECRET_BASE_BROWN_CAVE1_2   42
+#define SECRET_BASE_BROWN_CAVE1_3   43
+
+#define SECRET_BASE_BROWN_CAVE2_1   51
+#define SECRET_BASE_BROWN_CAVE2_2   52
+#define SECRET_BASE_BROWN_CAVE2_3   53
+
+#define SECRET_BASE_BROWN_CAVE3_1   61
+#define SECRET_BASE_BROWN_CAVE3_2   62
+#define SECRET_BASE_BROWN_CAVE3_3   63
+
+#define SECRET_BASE_BROWN_CAVE4_1   71
+#define SECRET_BASE_BROWN_CAVE4_2   72
+#define SECRET_BASE_BROWN_CAVE4_3   73
+
+#define SECRET_BASE_BLUE_CAVE1_1    81
+#define SECRET_BASE_BLUE_CAVE1_2    82
+#define SECRET_BASE_BLUE_CAVE1_3    83
+
+#define SECRET_BASE_BLUE_CAVE2_1    91
+#define SECRET_BASE_BLUE_CAVE2_2    92
+#define SECRET_BASE_BLUE_CAVE2_3    93
+
+#define SECRET_BASE_BLUE_CAVE3_1    101
+#define SECRET_BASE_BLUE_CAVE3_2    102
+#define SECRET_BASE_BLUE_CAVE3_3    103
+
+#define SECRET_BASE_BLUE_CAVE4_1    111
+#define SECRET_BASE_BLUE_CAVE4_2    112
+#define SECRET_BASE_BLUE_CAVE4_3    113
+
+#define SECRET_BASE_YELLOW_CAVE1_1  121
+#define SECRET_BASE_YELLOW_CAVE1_2  122
+#define SECRET_BASE_YELLOW_CAVE1_3  123
+
+#define SECRET_BASE_YELLOW_CAVE2_1  131
+#define SECRET_BASE_YELLOW_CAVE2_2  132
+#define SECRET_BASE_YELLOW_CAVE2_3  133
+
+#define SECRET_BASE_YELLOW_CAVE3_1  141
+#define SECRET_BASE_YELLOW_CAVE3_2  142
+#define SECRET_BASE_YELLOW_CAVE3_3  143
+
+#define SECRET_BASE_YELLOW_CAVE4_1  151
+#define SECRET_BASE_YELLOW_CAVE4_2  152
+#define SECRET_BASE_YELLOW_CAVE4_3  153
+
+#define SECRET_BASE_TREE1_1         161
+#define SECRET_BASE_TREE1_2         162
+#define SECRET_BASE_TREE1_3         163
+#define SECRET_BASE_TREE1_4         164
+
+#define SECRET_BASE_TREE2_1         171
+#define SECRET_BASE_TREE2_2         172
+#define SECRET_BASE_TREE2_3         173
+#define SECRET_BASE_TREE2_4         174
+
+#define SECRET_BASE_TREE3_1         181
+#define SECRET_BASE_TREE3_2         182
+#define SECRET_BASE_TREE3_3         183
+
+#define SECRET_BASE_TREE4_1         191
+#define SECRET_BASE_TREE4_2         192
+#define SECRET_BASE_TREE4_3         193
+
+#define SECRET_BASE_SHRUB1_1        201
+#define SECRET_BASE_SHRUB1_2        202
+#define SECRET_BASE_SHRUB1_3        203
+#define SECRET_BASE_SHRUB1_4        204
+
+#define SECRET_BASE_SHRUB2_1        211
+#define SECRET_BASE_SHRUB2_2        212
+#define SECRET_BASE_SHRUB2_3        213
+
+#define SECRET_BASE_SHRUB3_1        221
+#define SECRET_BASE_SHRUB3_2        222
+#define SECRET_BASE_SHRUB3_3        223
+
+#define SECRET_BASE_SHRUB4_1        231
+#define SECRET_BASE_SHRUB4_2        232
+#define SECRET_BASE_SHRUB4_3        233
 
 #endif  // GUARD_CONSTANTS_SECRET_BASES_H