99 files changed, 530 insertions, 440 deletions

diff --git a/data/layouts/Unknown_084693AC/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomUnused/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/Unknown_084693AC/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRoomUnused/border.bin
diff --git a/data/layouts/Unknown_084693AC/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomUnused/map.bin
index a179d8997..a179d8997 100644
--- a/data/layouts/Unknown_084693AC/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRoomUnused/map.bin
diff --git a/data/layouts/Unknown_0843E6C0/border.bin b/data/layouts/UnusedCave1/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E6C0/border.bin
+++ b/data/layouts/UnusedCave1/border.bin
diff --git a/data/layouts/Unknown_0843E6C0/map.bin b/data/layouts/UnusedCave1/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E6C0/map.bin
+++ b/data/layouts/UnusedCave1/map.bin
diff --git a/data/layouts/Unknown_0843E6E4/border.bin b/data/layouts/UnusedCave10/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E6E4/border.bin
+++ b/data/layouts/UnusedCave10/border.bin
diff --git a/data/layouts/Unknown_0843E6E4/map.bin b/data/layouts/UnusedCave10/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E6E4/map.bin
+++ b/data/layouts/UnusedCave10/map.bin
diff --git a/data/layouts/Unknown_0843E708/border.bin b/data/layouts/UnusedCave11/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E708/border.bin
+++ b/data/layouts/UnusedCave11/border.bin
diff --git a/data/layouts/Unknown_0843E708/map.bin b/data/layouts/UnusedCave11/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E708/map.bin
+++ b/data/layouts/UnusedCave11/map.bin
diff --git a/data/layouts/Unknown_0843E72C/border.bin b/data/layouts/UnusedCave12/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E72C/border.bin
+++ b/data/layouts/UnusedCave12/border.bin
diff --git a/data/layouts/Unknown_0843E72C/map.bin b/data/layouts/UnusedCave12/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E72C/map.bin
+++ b/data/layouts/UnusedCave12/map.bin
diff --git a/data/layouts/Unknown_0843E750/border.bin b/data/layouts/UnusedCave13/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E750/border.bin
+++ b/data/layouts/UnusedCave13/border.bin
diff --git a/data/layouts/Unknown_0843E750/map.bin b/data/layouts/UnusedCave13/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E750/map.bin
+++ b/data/layouts/UnusedCave13/map.bin
diff --git a/data/layouts/Unknown_0843E774/border.bin b/data/layouts/UnusedCave14/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E774/border.bin
+++ b/data/layouts/UnusedCave14/border.bin
diff --git a/data/layouts/Unknown_0843E774/map.bin b/data/layouts/UnusedCave14/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E774/map.bin
+++ b/data/layouts/UnusedCave14/map.bin
diff --git a/data/layouts/Unknown_0843E798/border.bin b/data/layouts/UnusedCave2/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E798/border.bin
+++ b/data/layouts/UnusedCave2/border.bin
diff --git a/data/layouts/Unknown_0843E798/map.bin b/data/layouts/UnusedCave2/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E798/map.bin
+++ b/data/layouts/UnusedCave2/map.bin
diff --git a/data/layouts/Unknown_0843E7BC/border.bin b/data/layouts/UnusedCave3/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E7BC/border.bin
+++ b/data/layouts/UnusedCave3/border.bin
diff --git a/data/layouts/Unknown_0843E7BC/map.bin b/data/layouts/UnusedCave3/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E7BC/map.bin
+++ b/data/layouts/UnusedCave3/map.bin
diff --git a/data/layouts/Unknown_0843E7E0/border.bin b/data/layouts/UnusedCave4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E7E0/border.bin
+++ b/data/layouts/UnusedCave4/border.bin
diff --git a/data/layouts/Unknown_0843E7E0/map.bin b/data/layouts/UnusedCave4/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E7E0/map.bin
+++ b/data/layouts/UnusedCave4/map.bin
diff --git a/data/layouts/Unknown_0843E804/border.bin b/data/layouts/UnusedCave5/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E804/border.bin
+++ b/data/layouts/UnusedCave5/border.bin
diff --git a/data/layouts/Unknown_0843E804/map.bin b/data/layouts/UnusedCave5/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E804/map.bin
+++ b/data/layouts/UnusedCave5/map.bin
diff --git a/data/layouts/Unknown_0843E828/border.bin b/data/layouts/UnusedCave6/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E828/border.bin
+++ b/data/layouts/UnusedCave6/border.bin
diff --git a/data/layouts/Unknown_0843E828/map.bin b/data/layouts/UnusedCave6/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E828/map.bin
+++ b/data/layouts/UnusedCave6/map.bin
diff --git a/data/layouts/Unknown_0843E84C/border.bin b/data/layouts/UnusedCave7/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E84C/border.bin
+++ b/data/layouts/UnusedCave7/border.bin
diff --git a/data/layouts/Unknown_0843E84C/map.bin b/data/layouts/UnusedCave7/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E84C/map.bin
+++ b/data/layouts/UnusedCave7/map.bin
diff --git a/data/layouts/Unknown_0843E870/border.bin b/data/layouts/UnusedCave8/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E870/border.bin
+++ b/data/layouts/UnusedCave8/border.bin
diff --git a/data/layouts/Unknown_0843E870/map.bin b/data/layouts/UnusedCave8/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E870/map.bin
+++ b/data/layouts/UnusedCave8/map.bin
diff --git a/data/layouts/Unknown_0843E894/border.bin b/data/layouts/UnusedCave9/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/Unknown_0843E894/border.bin
+++ b/data/layouts/UnusedCave9/border.bin
diff --git a/data/layouts/Unknown_0843E894/map.bin b/data/layouts/UnusedCave9/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/Unknown_0843E894/map.bin
+++ b/data/layouts/UnusedCave9/map.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_29/border.bin b/data/layouts/UnusedContestHall1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownLinkContestRoom_25_29/border.bin
+++ b/data/layouts/UnusedContestHall1/border.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_29/map.bin b/data/layouts/UnusedContestHall1/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownLinkContestRoom_25_29/map.bin
+++ b/data/layouts/UnusedContestHall1/map.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_30/border.bin b/data/layouts/UnusedContestHall2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownLinkContestRoom_25_30/border.bin
+++ b/data/layouts/UnusedContestHall2/border.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_30/map.bin b/data/layouts/UnusedContestHall2/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownLinkContestRoom_25_30/map.bin
+++ b/data/layouts/UnusedContestHall2/map.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_31/border.bin b/data/layouts/UnusedContestHall3/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownLinkContestRoom_25_31/border.bin
+++ b/data/layouts/UnusedContestHall3/border.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_31/map.bin b/data/layouts/UnusedContestHall3/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownLinkContestRoom_25_31/map.bin
+++ b/data/layouts/UnusedContestHall3/map.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_32/border.bin b/data/layouts/UnusedContestHall4/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownLinkContestRoom_25_32/border.bin
+++ b/data/layouts/UnusedContestHall4/border.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_32/map.bin b/data/layouts/UnusedContestHall4/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownLinkContestRoom_25_32/map.bin
+++ b/data/layouts/UnusedContestHall4/map.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_33/border.bin b/data/layouts/UnusedContestHall5/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownLinkContestRoom_25_33/border.bin
+++ b/data/layouts/UnusedContestHall5/border.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_33/map.bin b/data/layouts/UnusedContestHall5/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownLinkContestRoom_25_33/map.bin
+++ b/data/layouts/UnusedContestHall5/map.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_34/border.bin b/data/layouts/UnusedContestHall6/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownLinkContestRoom_25_34/border.bin
+++ b/data/layouts/UnusedContestHall6/border.bin
diff --git a/data/layouts/UnknownLinkContestRoom_25_34/map.bin b/data/layouts/UnusedContestHall6/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownLinkContestRoom_25_34/map.bin
+++ b/data/layouts/UnusedContestHall6/map.bin
diff --git a/data/layouts/Unknown_08428450/border.bin b/data/layouts/UnusedContestRoom1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/Unknown_08428450/border.bin
+++ b/data/layouts/UnusedContestRoom1/border.bin
diff --git a/data/layouts/Unknown_08428450/map.bin b/data/layouts/UnusedContestRoom1/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/layouts/Unknown_08428450/map.bin
+++ b/data/layouts/UnusedContestRoom1/map.bin
diff --git a/data/layouts/Unknown_084294C4/border.bin b/data/layouts/UnusedContestRoom2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/Unknown_084294C4/border.bin
+++ b/data/layouts/UnusedContestRoom2/border.bin
diff --git a/data/layouts/Unknown_084294C4/map.bin b/data/layouts/UnusedContestRoom2/map.bin
index 37f05b971..37f05b971 100644
--- a/data/layouts/Unknown_084294C4/map.bin
+++ b/data/layouts/UnusedContestRoom2/map.bin
diff --git a/data/layouts/Unknown_084294E8/border.bin b/data/layouts/UnusedContestRoom3/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/Unknown_084294E8/border.bin
+++ b/data/layouts/UnusedContestRoom3/border.bin
diff --git a/data/layouts/Unknown_084294E8/map.bin b/data/layouts/UnusedContestRoom3/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/layouts/Unknown_084294E8/map.bin
+++ b/data/layouts/UnusedContestRoom3/map.bin
diff --git a/data/layouts/Unknown_08447028/border.bin b/data/layouts/UnusedOutdoorArea/border.bin
index 9e4b3fb7a..9e4b3fb7a 100644
--- a/data/layouts/Unknown_08447028/border.bin
+++ b/data/layouts/UnusedOutdoorArea/border.bin
diff --git a/data/layouts/Unknown_08447028/map.bin b/data/layouts/UnusedOutdoorArea/map.bin
index 028da0526..028da0526 100644
--- a/data/layouts/Unknown_08447028/map.bin
+++ b/data/layouts/UnusedOutdoorArea/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 9292e10af..b8d841f72 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -742,14 +742,14 @@
       "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_08428450",
-      "name": "Unknown_08428450_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_ROOM1",
+      "name": "UnusedContestRoom1_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/Unknown_08428450/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_08428450/map.bin"
+      "border_filepath": "data/layouts/UnusedContestRoom1/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestRoom1/map.bin"
     },
     {
       "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE",
@@ -822,24 +822,24 @@
       "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_084294C4",
-      "name": "Unknown_084294C4_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_ROOM2",
+      "name": "UnusedContestRoom2_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/Unknown_084294C4/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_084294C4/map.bin"
+      "border_filepath": "data/layouts/UnusedContestRoom2/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestRoom2/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_084294E8",
-      "name": "Unknown_084294E8_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_ROOM3",
+      "name": "UnusedContestRoom3_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/Unknown_084294E8/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_084294E8/map.bin"
+      "border_filepath": "data/layouts/UnusedContestRoom3/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestRoom3/map.bin"
     },
     {
       "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB",
@@ -1692,144 +1692,144 @@
       "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E6C0",
-      "name": "Unknown_0843E6C0_Layout",
+      "id": "LAYOUT_UNUSED_CAVE1",
+      "name": "UnusedCave1_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E6C0/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E6C0/map.bin"
+      "border_filepath": "data/layouts/UnusedCave1/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave1/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E6E4",
-      "name": "Unknown_0843E6E4_Layout",
+      "id": "LAYOUT_UNUSED_CAVE2",
+      "name": "UnusedCave2_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E6E4/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E6E4/map.bin"
+      "border_filepath": "data/layouts/UnusedCave2/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave2/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E708",
-      "name": "Unknown_0843E708_Layout",
+      "id": "LAYOUT_UNUSED_CAVE3",
+      "name": "UnusedCave3_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E708/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E708/map.bin"
+      "border_filepath": "data/layouts/UnusedCave3/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave3/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E72C",
-      "name": "Unknown_0843E72C_Layout",
+      "id": "LAYOUT_UNUSED_CAVE4",
+      "name": "UnusedCave4_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E72C/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E72C/map.bin"
+      "border_filepath": "data/layouts/UnusedCave4/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave4/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E750",
-      "name": "Unknown_0843E750_Layout",
+      "id": "LAYOUT_UNUSED_CAVE5",
+      "name": "UnusedCave5_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E750/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E750/map.bin"
+      "border_filepath": "data/layouts/UnusedCave5/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave5/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E774",
-      "name": "Unknown_0843E774_Layout",
+      "id": "LAYOUT_UNUSED_CAVE6",
+      "name": "UnusedCave6_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E774/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E774/map.bin"
+      "border_filepath": "data/layouts/UnusedCave6/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave6/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E798",
-      "name": "Unknown_0843E798_Layout",
+      "id": "LAYOUT_UNUSED_CAVE7",
+      "name": "UnusedCave7_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E798/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E798/map.bin"
+      "border_filepath": "data/layouts/UnusedCave7/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave7/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E7BC",
-      "name": "Unknown_0843E7BC_Layout",
+      "id": "LAYOUT_UNUSED_CAVE8",
+      "name": "UnusedCave8_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E7BC/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E7BC/map.bin"
+      "border_filepath": "data/layouts/UnusedCave8/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave8/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E7E0",
-      "name": "Unknown_0843E7E0_Layout",
+      "id": "LAYOUT_UNUSED_CAVE9",
+      "name": "UnusedCave9_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E7E0/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E7E0/map.bin"
+      "border_filepath": "data/layouts/UnusedCave9/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave9/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E804",
-      "name": "Unknown_0843E804_Layout",
+      "id": "LAYOUT_UNUSED_CAVE10",
+      "name": "UnusedCave10_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E804/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E804/map.bin"
+      "border_filepath": "data/layouts/UnusedCave10/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave10/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E828",
-      "name": "Unknown_0843E828_Layout",
+      "id": "LAYOUT_UNUSED_CAVE11",
+      "name": "UnusedCave11_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E828/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E828/map.bin"
+      "border_filepath": "data/layouts/UnusedCave11/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave11/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E84C",
-      "name": "Unknown_0843E84C_Layout",
+      "id": "LAYOUT_UNUSED_CAVE12",
+      "name": "UnusedCave12_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E84C/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E84C/map.bin"
+      "border_filepath": "data/layouts/UnusedCave12/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave12/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E870",
-      "name": "Unknown_0843E870_Layout",
+      "id": "LAYOUT_UNUSED_CAVE13",
+      "name": "UnusedCave13_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E870/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E870/map.bin"
+      "border_filepath": "data/layouts/UnusedCave13/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave13/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_0843E894",
-      "name": "Unknown_0843E894_Layout",
+      "id": "LAYOUT_UNUSED_CAVE14",
+      "name": "UnusedCave14_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/Unknown_0843E894/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_0843E894/map.bin"
+      "border_filepath": "data/layouts/UnusedCave14/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedCave14/map.bin"
     },
     {
       "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE",
@@ -2252,64 +2252,64 @@
       "blockdata_filepath": "data/layouts/ContestHall/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
-      "name": "UnknownLinkContestRoom_25_29_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_HALL1",
+      "name": "UnusedContestHall1_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_29/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_29/map.bin"
+      "border_filepath": "data/layouts/UnusedContestHall1/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestHall1/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
-      "name": "UnknownLinkContestRoom_25_30_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_HALL2",
+      "name": "UnusedContestHall2_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_30/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_30/map.bin"
+      "border_filepath": "data/layouts/UnusedContestHall2/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestHall2/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
-      "name": "UnknownLinkContestRoom_25_31_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_HALL3",
+      "name": "UnusedContestHall3_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_31/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_31/map.bin"
+      "border_filepath": "data/layouts/UnusedContestHall3/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestHall3/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
-      "name": "UnknownLinkContestRoom_25_32_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_HALL4",
+      "name": "UnusedContestHall4_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_32/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_32/map.bin"
+      "border_filepath": "data/layouts/UnusedContestHall4/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestHall4/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
-      "name": "UnknownLinkContestRoom_25_33_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_HALL5",
+      "name": "UnusedContestHall5_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_33/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_33/map.bin"
+      "border_filepath": "data/layouts/UnusedContestHall5/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestHall5/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
-      "name": "UnknownLinkContestRoom_25_34_Layout",
+      "id": "LAYOUT_UNUSED_CONTEST_HALL6",
+      "name": "UnusedContestHall6_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_34/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
+      "border_filepath": "data/layouts/UnusedContestHall6/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedContestHall6/map.bin"
     },
     {
       "id": "LAYOUT_CONTEST_HALL_BEAUTY",
@@ -2412,14 +2412,14 @@
       "blockdata_filepath": "data/layouts/SafariZone_South/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_08447028",
-      "name": "Unknown_08447028_Layout",
+      "id": "LAYOUT_UNUSED_OUTDOOR_AREA",
+      "name": "UnusedOutdoorArea_Layout",
       "width": 58,
       "height": 26,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "0",
-      "border_filepath": "data/layouts/Unknown_08447028/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_08447028/map.bin"
+      "border_filepath": "data/layouts/UnusedOutdoorArea/border.bin",
+      "blockdata_filepath": "data/layouts/UnusedOutdoorArea/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE",
@@ -3582,14 +3582,14 @@
       "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_084693AC",
-      "name": "Unknown_084693AC_Layout",
+      "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED",
+      "name": "BattleFrontier_BattlePikeRoomUnused_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_BattlePike",
-      "border_filepath": "data/layouts/Unknown_084693AC/border.bin",
-      "blockdata_filepath": "data/layouts/Unknown_084693AC/map.bin"
+      "border_filepath": "data/layouts/BattleFrontier_BattlePikeRoomUnused/border.bin",
+      "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomUnused/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
diff --git a/data/map_events.s b/data/map_events.s
index d285040a0..dcbb9cfb1 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -10,6 +10,7 @@
 #include "constants/weather.h"
 #include "constants/trainer_hill.h"
 #include "constants/trainer_types.h"
+#include "constants/berry.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
index f55770b88..0edd978fd 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner",
-      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+      "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
@@ -38,7 +38,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist",
-      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+      "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
@@ -51,7 +51,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan",
-      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+      "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_MAN_4",
@@ -64,7 +64,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer",
-      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+      "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID",
@@ -77,7 +77,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid",
-      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+      "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
@@ -90,7 +90,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Woman",
-      "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
+      "flag": "FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_SCOTT",
@@ -103,7 +103,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Scott",
-      "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT"
+      "flag": "FLAG_HIDE_LILYCOVE_MOTEL_SCOTT"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json
index fc9adee3b..aaa63b11f 100644
--- a/data/maps/Route102/map.json
+++ b/data/maps/Route102/map.json
@@ -112,7 +112,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "2",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_ORAN",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -125,7 +125,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "1",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_102_PECHA",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 4b91f913b..fbf92dd0c 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -112,7 +112,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "5",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_CHERI_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -125,7 +125,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "6",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_LEPPA",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -138,7 +138,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "7",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_103_CHERI_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index 69e5faf27..6ec8b3752 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -156,7 +156,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "8",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_CHERI_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -169,7 +169,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "9",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -182,7 +182,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "10",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_LEPPA",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -195,7 +195,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "11",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_ORAN_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -208,7 +208,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "12",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -221,7 +221,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "13",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_PECHA",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -247,7 +247,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "3",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -260,7 +260,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "4",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_ORAN_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -273,7 +273,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "75",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_SOIL_4",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -286,7 +286,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "76",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_104_CHERI_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json
index bb5df5eb4..abfc2b767 100644
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -234,7 +234,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "16",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -247,7 +247,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "17",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -260,7 +260,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "18",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_110_NANAB_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index 014ac084c..4621591e4 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -104,7 +104,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "19",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_RAZZ_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -117,7 +117,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "20",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_RAZZ_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -273,7 +273,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "80",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_ORAN_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -286,7 +286,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "81",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_111_ORAN_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
index d4d650857..04b2e6d12 100644
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -117,7 +117,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "24",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_RAWST_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -130,7 +130,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "23",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_PECHA_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -143,7 +143,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "22",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_PECHA_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -156,7 +156,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "21",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_112_RAWST_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 37edf509d..38891b518 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -34,7 +34,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "77",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -47,7 +47,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "78",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -125,7 +125,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "68",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_114_PERSIM_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index 2d0dbdbaa..bbac132f5 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -73,7 +73,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "69",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -86,7 +86,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "70",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -99,7 +99,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "71",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_KELPSY_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -190,7 +190,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "55",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_BLUK_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -203,7 +203,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "56",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_115_BLUK_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
index 247a4b7b1..13b4bac1c 100644
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -34,7 +34,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "25",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_PINAP_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -47,7 +47,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "26",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_CHESTO_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -138,7 +138,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "66",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_CHESTO_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -151,7 +151,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "67",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_116_PINAP_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index dd923a7cd..b72866741 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -164,7 +164,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "29",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -177,7 +177,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "28",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -190,7 +190,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "27",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_117_WEPEAR_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index 7b541e629..67acb1b98 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -39,7 +39,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "31",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SITRUS_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -52,7 +52,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "32",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SOIL",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -65,7 +65,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "33",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_118_SITRUS_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index 8d78d1065..c5715daa2 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -34,7 +34,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "34",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -47,7 +47,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "35",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -60,7 +60,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "36",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_POMEG_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -372,7 +372,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "83",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_HONDEW_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -385,7 +385,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "84",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_HONDEW_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -398,7 +398,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "85",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_SITRUS",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -411,7 +411,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "86",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_119_LEPPA",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 787f51361..6b67310d3 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -34,7 +34,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "46",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_WEPEAR",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -47,7 +47,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "45",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PINAP",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -60,7 +60,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "44",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_NANAB",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -73,7 +73,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "43",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_RAZZ",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -86,7 +86,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "37",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -99,7 +99,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "38",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -112,7 +112,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "39",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_ASPEAR_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -125,7 +125,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "40",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -138,7 +138,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "41",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -151,7 +151,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "42",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_120_PECHA_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
index e956f6251..aa8f07085 100644
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -52,7 +52,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "47",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_PERSIM",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -65,7 +65,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "48",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_ASPEAR",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -78,7 +78,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "49",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_RAWST",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -91,7 +91,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "50",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_CHESTO",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -104,7 +104,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "51",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_SOIL_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -117,7 +117,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "52",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_NANAB_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -130,7 +130,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "53",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_NANAB_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -143,7 +143,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "54",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_121_SOIL_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index 1bd25310a..695b50acd 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -34,7 +34,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "58",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -47,7 +47,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "59",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_4",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -60,7 +60,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "60",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -73,7 +73,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "61",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -86,7 +86,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "62",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_LEPPA_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -99,7 +99,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "63",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_SOIL",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -112,7 +112,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "64",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_LEPPA_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -151,7 +151,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "65",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -164,7 +164,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "72",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_GREPA_4",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -177,7 +177,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "73",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -190,7 +190,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "74",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_3",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -203,7 +203,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "79",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_4",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -216,7 +216,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "14",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_QUALOT_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -229,7 +229,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "15",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_1",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -242,7 +242,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "30",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_POMEG_2",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -320,7 +320,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "87",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_PECHA",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -333,7 +333,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "88",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_SITRUS",
       "script": "BerryTreeScript",
       "flag": "0"
     },
@@ -346,7 +346,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "89",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_123_RAWST",
       "script": "BerryTreeScript",
       "flag": "0"
     },
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
index 7b4cf047c..c612eccb5 100644
--- a/data/maps/Route130/map.json
+++ b/data/maps/Route130/map.json
@@ -60,7 +60,7 @@
       "movement_range_x": 0,
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "82",
+      "trainer_sight_or_berry_tree_id": "BERRY_TREE_ROUTE_130_LIECHI",
       "script": "BerryTreeScript",
       "flag": "FLAG_TEMP_11"
     },
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index 644911ea6..41a224f75 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -70,7 +70,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5
 	removeobject LOCALID_SUBMARINE
 	setvar VAR_SLATEPORT_HARBOR_STATE, 2
 	setflag FLAG_MET_TEAM_AQUA_HARBOR
-	setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT
+	setflag FLAG_HIDE_LILYCOVE_MOTEL_SCOTT
 	compare VAR_0x8008, 0
 	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer0
 	compare VAR_0x8008, 1
diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json
deleted file mode 100644
index f73ffe22e..000000000
--- a/data/maps/UnknownLinkContestRoom_25_33/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33",
-  "name": "UnknownLinkContestRoom_25_33",
-  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
-  "music": "MUS_GSC_PEWTER",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_cycling": false,
-  "allow_escaping": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "ContestHall",
-  "shared_scripts_map": "ContestHall"
-}
diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json
deleted file mode 100644
index f5ddbbe5a..000000000
--- a/data/maps/UnknownLinkContestRoom_25_34/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34",
-  "name": "UnknownLinkContestRoom_25_34",
-  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
-  "music": "MUS_GSC_PEWTER",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_cycling": false,
-  "allow_escaping": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "ContestHall",
-  "shared_scripts_map": "ContestHall"
-}
diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnusedContestHall1/map.json
index 72ed407ee..f0cc06947 100644
--- a/data/maps/UnknownLinkContestRoom_25_29/map.json
+++ b/data/maps/UnusedContestHall1/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29",
-  "name": "UnknownLinkContestRoom_25_29",
-  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
+  "id": "MAP_UNUSED_CONTEST_HALL1",
+  "name": "UnusedContestHall1",
+  "layout": "LAYOUT_UNUSED_CONTEST_HALL1",
   "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnusedContestHall2/map.json
index cd4d6fddd..96f47e5df 100644
--- a/data/maps/UnknownLinkContestRoom_25_30/map.json
+++ b/data/maps/UnusedContestHall2/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30",
-  "name": "UnknownLinkContestRoom_25_30",
-  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
+  "id": "MAP_UNUSED_CONTEST_HALL2",
+  "name": "UnusedContestHall2",
+  "layout": "LAYOUT_UNUSED_CONTEST_HALL2",
   "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnusedContestHall3/map.json
index 975ec382d..95d20e61d 100644
--- a/data/maps/UnknownLinkContestRoom_25_31/map.json
+++ b/data/maps/UnusedContestHall3/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31",
-  "name": "UnknownLinkContestRoom_25_31",
-  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
+  "id": "MAP_UNUSED_CONTEST_HALL3",
+  "name": "UnusedContestHall3",
+  "layout": "LAYOUT_UNUSED_CONTEST_HALL3",
   "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnusedContestHall4/map.json
index d2d673adc..b4e715842 100644
--- a/data/maps/UnknownLinkContestRoom_25_32/map.json
+++ b/data/maps/UnusedContestHall4/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32",
-  "name": "UnknownLinkContestRoom_25_32",
-  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
+  "id": "MAP_UNUSED_CONTEST_HALL4",
+  "name": "UnusedContestHall4",
+  "layout": "LAYOUT_UNUSED_CONTEST_HALL4",
   "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnusedContestHall5/map.json b/data/maps/UnusedContestHall5/map.json
new file mode 100644
index 000000000..4c1281bf3
--- /dev/null
+++ b/data/maps/UnusedContestHall5/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNUSED_CONTEST_HALL5",
+  "name": "UnusedContestHall5",
+  "layout": "LAYOUT_UNUSED_CONTEST_HALL5",
+  "music": "MUS_GSC_PEWTER",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
+}
diff --git a/data/maps/UnusedContestHall6/map.json b/data/maps/UnusedContestHall6/map.json
new file mode 100644
index 000000000..c0a7dbb4d
--- /dev/null
+++ b/data/maps/UnusedContestHall6/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_UNUSED_CONTEST_HALL6",
+  "name": "UnusedContestHall6",
+  "layout": "LAYOUT_UNUSED_CONTEST_HALL6",
+  "music": "MUS_GSC_PEWTER",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
+}
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 4201e814f..4268abbef 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -461,12 +461,12 @@
     "RecordCorner",
     "BattleColosseum_4P",
     "ContestHall",
-    "UnknownLinkContestRoom_25_29",
-    "UnknownLinkContestRoom_25_30",
-    "UnknownLinkContestRoom_25_31",
-    "UnknownLinkContestRoom_25_32",
-    "UnknownLinkContestRoom_25_33",
-    "UnknownLinkContestRoom_25_34",
+    "UnusedContestHall1",
+    "UnusedContestHall2",
+    "UnusedContestHall3",
+    "UnusedContestHall4",
+    "UnusedContestHall5",
+    "UnusedContestHall6",
     "ContestHallBeauty",
     "ContestHallTough",
     "ContestHallCool",
diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
index 91a88f348..021784f81 100644
--- a/data/scripts/hall_of_fame.inc
+++ b/data/scripts/hall_of_fame.inc
@@ -4,7 +4,7 @@ EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1
 	call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
 	compare VAR_FOSSIL_MANIAC_STATE, 0
 	call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady
-	clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	clearflag FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS
 	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
 	setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
 	clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 77102a001..422186695 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -1,115 +1,115 @@
 EventScript_ResetAllBerries:: @ 827149D
 	@ Route 102
-	setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_102_ORAN,  ITEM_TO_BERRY(ITEM_ORAN_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_102_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
 
 	@ Route 104
-	setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_104_ORAN_2,  ITEM_TO_BERRY(ITEM_ORAN_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_104_PECHA,   ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_104_ORAN_1,  ITEM_TO_BERRY(ITEM_ORAN_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_104_CHERI_2, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_104_CHERI_1, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_104_LEPPA,   ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
 
 	@ Route 116
-	setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_116_PINAP_1,  ITEM_TO_BERRY(ITEM_PINAP_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_116_CHESTO_1, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_116_CHESTO_2, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_116_PINAP_2,  ITEM_TO_BERRY(ITEM_PINAP_BERRY),  BERRY_STAGE_BERRIES
 
 	@ Route 115
-	setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_115_KELPSY_1, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_115_KELPSY_2, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_115_KELPSY_3, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_115_BLUK_1,   ITEM_TO_BERRY(ITEM_BLUK_BERRY),   BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_115_BLUK_2,   ITEM_TO_BERRY(ITEM_BLUK_BERRY),   BERRY_STAGE_BERRIES
 
 	@ Route 103
-	setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_103_CHERI_1, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_103_LEPPA,   ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_103_CHERI_2, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
 
 	@ Route 110
-	setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_110_NANAB_1, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_110_NANAB_2, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_110_NANAB_3, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
 
 	@ Route 117
-	setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_117_WEPEAR_3, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_117_WEPEAR_2, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_117_WEPEAR_1, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
 	
 	@ Route 112
-	setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_112_RAWST_2, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_112_PECHA_2, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_112_PECHA_1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_112_RAWST_1, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
 
 	@ Route 111
-	setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_111_RAZZ_1, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_111_RAZZ_2, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_111_ORAN_1, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_111_ORAN_2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
 
 	@ Route 114
-	setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_114_PERSIM_2, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_114_PERSIM_3, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_114_PERSIM_1, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
 
 	@ Route 118
-	setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_118_SITRUS_1, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_118_SITRUS_2, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
 
 	@ Route 119
-	setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_119_POMEG_1,  ITEM_TO_BERRY(ITEM_POMEG_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_119_POMEG_2,  ITEM_TO_BERRY(ITEM_POMEG_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_119_POMEG_3,  ITEM_TO_BERRY(ITEM_POMEG_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_119_HONDEW_1, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_119_HONDEW_2, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_119_SITRUS,   ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_119_LEPPA,    ITEM_TO_BERRY(ITEM_LEPPA_BERRY),  BERRY_STAGE_BERRIES
 
 	@ Route 120
-	setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_ASPEAR_1, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_ASPEAR_2, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_ASPEAR_3, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_PECHA_1,  ITEM_TO_BERRY(ITEM_PECHA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_PECHA_2,  ITEM_TO_BERRY(ITEM_PECHA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_PECHA_3,  ITEM_TO_BERRY(ITEM_PECHA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_WEPEAR,   ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_PINAP,    ITEM_TO_BERRY(ITEM_PINAP_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_NANAB,    ITEM_TO_BERRY(ITEM_NANAB_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_120_RAZZ,     ITEM_TO_BERRY(ITEM_RAZZ_BERRY),   BERRY_STAGE_BERRIES
 
 	@ Route 121
-	setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_121_PERSIM,  ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_121_ASPEAR,  ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_121_RAWST,   ITEM_TO_BERRY(ITEM_RAWST_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_121_CHESTO,  ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_121_NANAB_1, ITEM_TO_BERRY(ITEM_NANAB_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_121_NANAB_2, ITEM_TO_BERRY(ITEM_NANAB_BERRY),  BERRY_STAGE_BERRIES
 
 	@ Route 123
-	setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
-	setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_LEPPA_1,  ITEM_TO_BERRY(ITEM_LEPPA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_LEPPA_2,  ITEM_TO_BERRY(ITEM_LEPPA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_POMEG_3,  ITEM_TO_BERRY(ITEM_POMEG_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_POMEG_4,  ITEM_TO_BERRY(ITEM_POMEG_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_GREPA_1,  ITEM_TO_BERRY(ITEM_GREPA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_GREPA_2,  ITEM_TO_BERRY(ITEM_GREPA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_QUALOT_4, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_QUALOT_1, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_POMEG_1,  ITEM_TO_BERRY(ITEM_POMEG_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_POMEG_2,  ITEM_TO_BERRY(ITEM_POMEG_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_GREPA_3,  ITEM_TO_BERRY(ITEM_GREPA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_GREPA_4,  ITEM_TO_BERRY(ITEM_GREPA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_QUALOT_2, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_QUALOT_3, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_PECHA,    ITEM_TO_BERRY(ITEM_PECHA_BERRY),  BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_SITRUS,   ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_123_RAWST,    ITEM_TO_BERRY(ITEM_RAWST_BERRY),  BERRY_STAGE_BERRIES
 
 	@ Mirage Island
-	setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree BERRY_TREE_ROUTE_130_LIECHI, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
 	return
 
 EventScript_ResetAllMapFlags:: @ 82715DE
@@ -229,7 +229,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE
 	setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
 	setflag FLAG_HIDE_ROUTE_104_RIVAL
-	setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+	setflag FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS
 	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
 	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE
 	setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
diff --git a/include/berry.h b/include/berry.h
index 3412caae5..4a5a46615 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -1,8 +1,6 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H
 
-#include "constants/berry.h"
-
 void ClearEnigmaBerries(void);
 void SetEnigmaBerry(u8 *src);
 bool32 IsEnigmaBerryValid(void);
diff --git a/include/constants/berry.h b/include/constants/berry.h
index 8f1e7cd82..3ba59c0f5 100644
--- a/include/constants/berry.h
+++ b/include/constants/berry.h
@@ -32,4 +32,101 @@
 // - BERRY_STAGE_FLOWERING
 #define NUM_WATER_STAGES 4
 
+// IDs for berry tree objects, indexes into berryTrees in SaveBlock1
+// Named for whatever berry is initially planted there on a new game
+// Those with no initial berry are named "soil"
+#define BERRY_TREE_ROUTE_102_PECHA    1
+#define BERRY_TREE_ROUTE_102_ORAN     2
+#define BERRY_TREE_ROUTE_104_SOIL_1   3
+#define BERRY_TREE_ROUTE_104_ORAN_1   4
+#define BERRY_TREE_ROUTE_103_CHERI_1  5
+#define BERRY_TREE_ROUTE_103_LEPPA    6
+#define BERRY_TREE_ROUTE_103_CHERI_2  7
+#define BERRY_TREE_ROUTE_104_CHERI_1  8
+#define BERRY_TREE_ROUTE_104_SOIL_2   9
+#define BERRY_TREE_ROUTE_104_LEPPA    10
+#define BERRY_TREE_ROUTE_104_ORAN_2   11
+#define BERRY_TREE_ROUTE_104_SOIL_3   12
+#define BERRY_TREE_ROUTE_104_PECHA    13
+#define BERRY_TREE_ROUTE_123_QUALOT_1 14
+#define BERRY_TREE_ROUTE_123_POMEG_1  15
+#define BERRY_TREE_ROUTE_110_NANAB_1  16
+#define BERRY_TREE_ROUTE_110_NANAB_2  17
+#define BERRY_TREE_ROUTE_110_NANAB_3  18
+#define BERRY_TREE_ROUTE_111_RAZZ_1   19
+#define BERRY_TREE_ROUTE_111_RAZZ_2   20
+#define BERRY_TREE_ROUTE_112_RAWST_1  21
+#define BERRY_TREE_ROUTE_112_PECHA_1  22
+#define BERRY_TREE_ROUTE_112_PECHA_2  23
+#define BERRY_TREE_ROUTE_112_RAWST_2  24
+#define BERRY_TREE_ROUTE_116_PINAP_1  25
+#define BERRY_TREE_ROUTE_116_CHESTO_1 26
+#define BERRY_TREE_ROUTE_117_WEPEAR_1 27
+#define BERRY_TREE_ROUTE_117_WEPEAR_2 28
+#define BERRY_TREE_ROUTE_117_WEPEAR_3 29
+#define BERRY_TREE_ROUTE_123_POMEG_2  30
+#define BERRY_TREE_ROUTE_118_SITRUS_1 31
+#define BERRY_TREE_ROUTE_118_SOIL     32
+#define BERRY_TREE_ROUTE_118_SITRUS_2 33
+#define BERRY_TREE_ROUTE_119_POMEG_1  34
+#define BERRY_TREE_ROUTE_119_POMEG_2  35
+#define BERRY_TREE_ROUTE_119_POMEG_3  36
+#define BERRY_TREE_ROUTE_120_ASPEAR_1 37
+#define BERRY_TREE_ROUTE_120_ASPEAR_2 38
+#define BERRY_TREE_ROUTE_120_ASPEAR_3 39
+#define BERRY_TREE_ROUTE_120_PECHA_1  40
+#define BERRY_TREE_ROUTE_120_PECHA_2  41
+#define BERRY_TREE_ROUTE_120_PECHA_3  42
+#define BERRY_TREE_ROUTE_120_RAZZ     43
+#define BERRY_TREE_ROUTE_120_NANAB    44
+#define BERRY_TREE_ROUTE_120_PINAP    45
+#define BERRY_TREE_ROUTE_120_WEPEAR   46
+#define BERRY_TREE_ROUTE_121_PERSIM   47
+#define BERRY_TREE_ROUTE_121_ASPEAR   48
+#define BERRY_TREE_ROUTE_121_RAWST    49
+#define BERRY_TREE_ROUTE_121_CHESTO   50
+#define BERRY_TREE_ROUTE_121_SOIL_1   51
+#define BERRY_TREE_ROUTE_121_NANAB_1  52
+#define BERRY_TREE_ROUTE_121_NANAB_2  53
+#define BERRY_TREE_ROUTE_121_SOIL_2   54
+#define BERRY_TREE_ROUTE_115_BLUK_1   55
+#define BERRY_TREE_ROUTE_115_BLUK_2   56
+#define BERRY_TREE_UNUSED             57
+#define BERRY_TREE_ROUTE_123_POMEG_3  58
+#define BERRY_TREE_ROUTE_123_POMEG_4  59
+#define BERRY_TREE_ROUTE_123_GREPA_1  60
+#define BERRY_TREE_ROUTE_123_GREPA_2  61
+#define BERRY_TREE_ROUTE_123_LEPPA_1  62
+#define BERRY_TREE_ROUTE_123_SOIL     63
+#define BERRY_TREE_ROUTE_123_LEPPA_2  64
+#define BERRY_TREE_ROUTE_123_GREPA_3  65
+#define BERRY_TREE_ROUTE_116_CHESTO_2 66
+#define BERRY_TREE_ROUTE_116_PINAP_2  67
+#define BERRY_TREE_ROUTE_114_PERSIM_1 68
+#define BERRY_TREE_ROUTE_115_KELPSY_1 69
+#define BERRY_TREE_ROUTE_115_KELPSY_2 70
+#define BERRY_TREE_ROUTE_115_KELPSY_3 71
+#define BERRY_TREE_ROUTE_123_GREPA_4  72
+#define BERRY_TREE_ROUTE_123_QUALOT_2 73
+#define BERRY_TREE_ROUTE_123_QUALOT_3 74
+#define BERRY_TREE_ROUTE_104_SOIL_4   75
+#define BERRY_TREE_ROUTE_104_CHERI_2  76
+#define BERRY_TREE_ROUTE_114_PERSIM_2 77
+#define BERRY_TREE_ROUTE_114_PERSIM_3 78
+#define BERRY_TREE_ROUTE_123_QUALOT_4 79
+#define BERRY_TREE_ROUTE_111_ORAN_1   80
+#define BERRY_TREE_ROUTE_111_ORAN_2   81
+#define BERRY_TREE_ROUTE_130_LIECHI   82
+#define BERRY_TREE_ROUTE_119_HONDEW_1 83
+#define BERRY_TREE_ROUTE_119_HONDEW_2 84
+#define BERRY_TREE_ROUTE_119_SITRUS   85
+#define BERRY_TREE_ROUTE_119_LEPPA    86
+#define BERRY_TREE_ROUTE_123_PECHA    87
+#define BERRY_TREE_ROUTE_123_SITRUS   88
+#define BERRY_TREE_ROUTE_123_RAWST    89
+
+// Remainder are unused
+
+#define BERRY_TREES_COUNT 128
+
 #endif // GUARD_CONSTANTS_BERRY_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 9be269105..21b730de3 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -829,7 +829,7 @@
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM          0x310
 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM              0x311
 #define FLAG_HIDE_ROUTE_119_SCOTT                                   0x312
-#define FLAG_HIDE_LILCOVE_MOTEL_SCOTT                               0x313
+#define FLAG_HIDE_LILYCOVE_MOTEL_SCOTT                              0x313
 #define FLAG_HIDE_MOSSDEEP_CITY_SCOTT                               0x314
 #define FLAG_HIDE_FANCLUB_OLD_LADY                                  0x315
 #define FLAG_HIDE_FANCLUB_BOY                                       0x316
@@ -967,7 +967,7 @@
 #define FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE                           0x39A
 #define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE                           0x39B
 #define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS                               0x39C
-#define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS                      0x39D
+#define FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS                     0x39D
 #define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA                              0x39E
 #define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA                             0x39F
 #define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO                        0x3A0
diff --git a/include/constants/global.h b/include/constants/global.h
index 55830ae8b..8033dec87 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -33,7 +33,6 @@
 #define DAYCARE_MON_COUNT 2
 #define POKEBLOCKS_COUNT 40
 #define OBJECT_EVENTS_COUNT 16
-#define BERRY_TREES_COUNT 128
 #define MAIL_COUNT 16
 #define SECRET_BASES_COUNT 20
 #define TV_SHOWS_COUNT 25
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 9d5e877b0..db92c9594 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -79,7 +79,7 @@
 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72
 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73
 #define LAYOUT_LILYCOVE_CITY_HOUSE2 74
-#define LAYOUT_UNKNOWN_08428450 75
+#define LAYOUT_UNUSED_CONTEST_ROOM1 75
 #define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76
 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77
 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78
@@ -87,8 +87,8 @@
 #define LAYOUT_HOUSE_WITH_BED 80
 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81
 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82
-#define LAYOUT_UNKNOWN_084294C4 83
-#define LAYOUT_UNKNOWN_084294E8 84
+#define LAYOUT_UNUSED_CONTEST_ROOM2 83
+#define LAYOUT_UNUSED_CONTEST_ROOM3 84
 #define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85
 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86
 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87
@@ -174,20 +174,20 @@
 #define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167
 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168
 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169
-#define LAYOUT_UNKNOWN_0843E6C0 170
-#define LAYOUT_UNKNOWN_0843E6E4 171
-#define LAYOUT_UNKNOWN_0843E708 172
-#define LAYOUT_UNKNOWN_0843E72C 173
-#define LAYOUT_UNKNOWN_0843E750 174
-#define LAYOUT_UNKNOWN_0843E774 175
-#define LAYOUT_UNKNOWN_0843E798 176
-#define LAYOUT_UNKNOWN_0843E7BC 177
-#define LAYOUT_UNKNOWN_0843E7E0 178
-#define LAYOUT_UNKNOWN_0843E804 179
-#define LAYOUT_UNKNOWN_0843E828 180
-#define LAYOUT_UNKNOWN_0843E84C 181
-#define LAYOUT_UNKNOWN_0843E870 182
-#define LAYOUT_UNKNOWN_0843E894 183
+#define LAYOUT_UNUSED_CAVE1 170
+#define LAYOUT_UNUSED_CAVE2 171
+#define LAYOUT_UNUSED_CAVE3 172
+#define LAYOUT_UNUSED_CAVE4 173
+#define LAYOUT_UNUSED_CAVE5 174
+#define LAYOUT_UNUSED_CAVE6 175
+#define LAYOUT_UNUSED_CAVE7 176
+#define LAYOUT_UNUSED_CAVE8 177
+#define LAYOUT_UNUSED_CAVE9 178
+#define LAYOUT_UNUSED_CAVE10 179
+#define LAYOUT_UNUSED_CAVE11 180
+#define LAYOUT_UNUSED_CAVE12 181
+#define LAYOUT_UNUSED_CAVE13 182
+#define LAYOUT_UNUSED_CAVE14 183
 #define LAYOUT_NEW_MAUVILLE_ENTRANCE 184
 #define LAYOUT_NEW_MAUVILLE_INSIDE 185
 #define LAYOUT_ABANDONED_SHIP_DECK 186
@@ -230,12 +230,12 @@
 #define LAYOUT_RECORD_CORNER 223
 #define LAYOUT_BATTLE_COLOSSEUM_4P 224
 #define LAYOUT_CONTEST_HALL 225
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230
-#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231
+#define LAYOUT_UNUSED_CONTEST_HALL1 226
+#define LAYOUT_UNUSED_CONTEST_HALL2 227
+#define LAYOUT_UNUSED_CONTEST_HALL3 228
+#define LAYOUT_UNUSED_CONTEST_HALL4 229
+#define LAYOUT_UNUSED_CONTEST_HALL5 230
+#define LAYOUT_UNUSED_CONTEST_HALL6 231
 #define LAYOUT_CONTEST_HALL_BEAUTY 232
 #define LAYOUT_CONTEST_HALL_TOUGH 233
 #define LAYOUT_CONTEST_HALL_COOL 234
@@ -246,7 +246,7 @@
 #define LAYOUT_SAFARI_ZONE_NORTH 239
 #define LAYOUT_SAFARI_ZONE_SOUTHWEST 240
 #define LAYOUT_SAFARI_ZONE_SOUTH 241
-#define LAYOUT_UNKNOWN_08447028 242
+#define LAYOUT_UNUSED_OUTDOOR_AREA 242
 #define LAYOUT_ROUTE109_SEASHORE_HOUSE 243
 #define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244
 #define LAYOUT_ROUTE110_TRICK_HOUSE_END 245
@@ -363,7 +363,7 @@
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356
 #define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS 358
-#define LAYOUT_UNKNOWN_084693AC 359
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED 359
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR 361
 #define LAYOUT_BATTLE_PYRAMID_SQUARE01 362
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 69355635b..c650600e8 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -402,67 +402,67 @@
 #define MAP_METEOR_FALLS_STEVENS_CAVE                (107 | (24 << 8))
 
 // Map Group 25
-#define MAP_SECRET_BASE_RED_CAVE1           (0 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE1         (1 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE1          (2 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE1        (3 | (25 << 8))
-#define MAP_SECRET_BASE_TREE1               (4 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB1              (5 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE2           (6 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE2         (7 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE2          (8 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE2        (9 | (25 << 8))
-#define MAP_SECRET_BASE_TREE2               (10 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB2              (11 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE3           (12 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE3         (13 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE3          (14 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE3        (15 | (25 << 8))
-#define MAP_SECRET_BASE_TREE3               (16 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB3              (17 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE4           (18 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE4         (19 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE4          (20 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE4        (21 | (25 << 8))
-#define MAP_SECRET_BASE_TREE4               (22 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB4              (23 | (25 << 8))
-#define MAP_BATTLE_COLOSSEUM_2P             (24 | (25 << 8))
-#define MAP_TRADE_CENTER                    (25 | (25 << 8))
-#define MAP_RECORD_CORNER                   (26 | (25 << 8))
-#define MAP_BATTLE_COLOSSEUM_4P             (27 | (25 << 8))
-#define MAP_CONTEST_HALL                    (28 | (25 << 8))
-#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
-#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))
-#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31 (31 | (25 << 8))
-#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32 (32 | (25 << 8))
-#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33 (33 | (25 << 8))
-#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34 (34 | (25 << 8))
-#define MAP_CONTEST_HALL_BEAUTY             (35 | (25 << 8))
-#define MAP_CONTEST_HALL_TOUGH              (36 | (25 << 8))
-#define MAP_CONTEST_HALL_COOL               (37 | (25 << 8))
-#define MAP_CONTEST_HALL_SMART              (38 | (25 << 8))
-#define MAP_CONTEST_HALL_CUTE               (39 | (25 << 8))
-#define MAP_INSIDE_OF_TRUCK                 (40 | (25 << 8))
-#define MAP_SS_TIDAL_CORRIDOR               (41 | (25 << 8))
-#define MAP_SS_TIDAL_LOWER_DECK             (42 | (25 << 8))
-#define MAP_SS_TIDAL_ROOMS                  (43 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE01         (44 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE02         (45 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE03         (46 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE04         (47 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE05         (48 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE06         (49 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE07         (50 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE08         (51 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE09         (52 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE10         (53 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE11         (54 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE12         (55 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE13         (56 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE14         (57 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE15         (58 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE16         (59 | (25 << 8))
-#define MAP_UNION_ROOM                      (60 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE1  (1 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE1   (2 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
+#define MAP_SECRET_BASE_TREE1        (4 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB1       (5 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE2    (6 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE2  (7 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE2   (8 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
+#define MAP_SECRET_BASE_TREE2        (10 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB2       (11 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE3    (12 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE3  (13 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE3   (14 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
+#define MAP_SECRET_BASE_TREE3        (16 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB3       (17 | (25 << 8))
+#define MAP_SECRET_BASE_RED_CAVE4    (18 | (25 << 8))
+#define MAP_SECRET_BASE_BROWN_CAVE4  (19 | (25 << 8))
+#define MAP_SECRET_BASE_BLUE_CAVE4   (20 | (25 << 8))
+#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
+#define MAP_SECRET_BASE_TREE4        (22 | (25 << 8))
+#define MAP_SECRET_BASE_SHRUB4       (23 | (25 << 8))
+#define MAP_BATTLE_COLOSSEUM_2P      (24 | (25 << 8))
+#define MAP_TRADE_CENTER             (25 | (25 << 8))
+#define MAP_RECORD_CORNER            (26 | (25 << 8))
+#define MAP_BATTLE_COLOSSEUM_4P      (27 | (25 << 8))
+#define MAP_CONTEST_HALL             (28 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL1     (29 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL2     (30 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL3     (31 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL4     (32 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL5     (33 | (25 << 8))
+#define MAP_UNUSED_CONTEST_HALL6     (34 | (25 << 8))
+#define MAP_CONTEST_HALL_BEAUTY      (35 | (25 << 8))
+#define MAP_CONTEST_HALL_TOUGH       (36 | (25 << 8))
+#define MAP_CONTEST_HALL_COOL        (37 | (25 << 8))
+#define MAP_CONTEST_HALL_SMART       (38 | (25 << 8))
+#define MAP_CONTEST_HALL_CUTE        (39 | (25 << 8))
+#define MAP_INSIDE_OF_TRUCK          (40 | (25 << 8))
+#define MAP_SS_TIDAL_CORRIDOR        (41 | (25 << 8))
+#define MAP_SS_TIDAL_LOWER_DECK      (42 | (25 << 8))
+#define MAP_SS_TIDAL_ROOMS           (43 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE01  (44 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE02  (45 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE03  (46 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE04  (47 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE05  (48 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE06  (49 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE07  (50 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE08  (51 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE09  (52 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE10  (53 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE11  (54 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE12  (55 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE13  (56 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE14  (57 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE15  (58 | (25 << 8))
+#define MAP_BATTLE_PYRAMID_SQUARE16  (59 | (25 << 8))
+#define MAP_UNION_ROOM               (60 | (25 << 8))
 
 // Map Group 26
 #define MAP_SAFARI_ZONE_NORTHWEST                           (0 | (26 << 8))
diff --git a/include/global.h b/include/global.h
index 4ccd2be50..9587eb1f3 100644
--- a/include/global.h
+++ b/include/global.h
@@ -9,6 +9,7 @@
 #include "constants/flags.h"
 #include "constants/vars.h"
 #include "constants/species.h"
+#include "constants/berry.h"
 
 // Prevent cross-jump optimization.
 #define BLOCK_CROSS_JUMP asm("");
diff --git a/src/battle_message.c b/src/battle_message.c
index 3920f94cf..46444a8fa 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -21,7 +21,6 @@
 #include "window.h"
 #include "constants/battle_dome.h"
 #include "constants/battle_string_ids.h"
-#include "constants/berry.h"
 #include "constants/frontier_util.h"
 #include "constants/items.h"
 #include "constants/moves.h"
diff --git a/src/battle_pike.c b/src/battle_pike.c
index a161b88b8..ed18b2f71 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -1326,7 +1326,7 @@ bool8 InBattlePike(void)
     return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM
         || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
         || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS
-        || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_084693AC;
+        || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED;
 }
 
 static void SetHintedRoom(void)
diff --git a/src/battle_util.c b/src/battle_util.c
index b7919f904..210e418c6 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -29,7 +29,6 @@
 #include "constants/battle_move_effects.h"
 #include "constants/battle_script_commands.h"
 #include "constants/battle_string_ids.h"
-#include "constants/berry.h"
 #include "constants/hold_effects.h"
 #include "constants/items.h"
 #include "constants/moves.h"
diff --git a/src/berry.c b/src/berry.c
index 022fdc934..ea62deabf 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -11,7 +11,6 @@
 #include "random.h"
 #include "string_util.h"
 #include "text.h"
-#include "constants/berry.h"
 #include "constants/event_object_movement.h"
 #include "constants/items.h"
 
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 08a25c58a..252407562 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -34,7 +34,6 @@
 #include "new_game.h"
 #include "save.h"
 #include "strings.h"
-#include "constants/berry.h"
 #include "constants/game_stat.h"
 #include "constants/items.h"
 #include "constants/rgb.h"
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 089228b17..5be149b0f 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -26,7 +26,6 @@
 #include "item_menu_icons.h"
 #include "decompress.h"
 #include "international_string_util.h"
-#include "constants/berry.h"
 #include "constants/items.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
diff --git a/src/field_effect.c b/src/field_effect.c
index b1837c514..467a0f656 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -967,8 +967,8 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
     curBlue  -= ((curBlue  * b) >> 4);
     
     color  = curRed;
-    color |= curGreen <<  5;
-    color |= curBlue  << 10;
+    color |= (curGreen <<  5);
+    color |= (curBlue  << 10);
     
     gPlttBufferFaded[i] = color;
 }
diff --git a/src/field_weather.c b/src/field_weather.c
index 25ee0582a..02e3a0cb0 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -494,7 +494,7 @@ static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
                     r = gammaTable[baseColor.r];
                     g = gammaTable[baseColor.g];
                     b = gammaTable[baseColor.b];
-                    gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r;
+                    gPlttBufferFaded[palOffset++] = RGB2(r, g, b);
                 }
             }
 
@@ -579,7 +579,7 @@ static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaI
                 r += ((rBlend - r) * blendCoeff) >> 4;
                 g += ((gBlend - g) * blendCoeff) >> 4;
                 b += ((bBlend - b) * blendCoeff) >> 4;
-                gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r;
+                gPlttBufferFaded[palOffset++] = RGB2(r, g, b);
             }
         }
 
@@ -636,7 +636,7 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl
                 g2 += ((gBlend - g2) * blendCoeff) >> 4;
                 b2 += ((bBlend - b2) * blendCoeff) >> 4;
 
-                gPlttBufferFaded[palOffset++] = (b2 << 10) | (g2 << 5) | r2;
+                gPlttBufferFaded[palOffset++] = RGB2(r2, g2, b2);
             }
         }
     }
@@ -678,7 +678,7 @@ static void ApplyFogBlend(u8 blendCoeff, u16 blendColor)
                 g += ((gBlend - g) * blendCoeff) >> 4;
                 b += ((bBlend - b) * blendCoeff) >> 4;
 
-                gPlttBufferFaded[palOffset] = (b << 10) | (g << 5) | r;
+                gPlttBufferFaded[palOffset] = RGB2(r, g, b);
                 palOffset++;
             }
         }
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 7de963893..74e3455c3 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -23,7 +23,6 @@
 #include "text_window.h"
 #include "trig.h"
 #include "window.h"
-#include "constants/berry.h"
 #include "constants/songs.h"
 #include "gba/io_reg.h"
 
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 0bfb10632..4485fe1ef 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -29,7 +29,6 @@
 #include "task.h"
 #include "text.h"
 #include "text_window.h"
-#include "constants/berry.h"
 #include "constants/items.h"
 #include "constants/songs.h"
 #include "constants/rgb.h"
diff --git a/src/util.c b/src/util.c
index 8aa54857a..a4e3fa4cf 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2,6 +2,7 @@
 #include "util.h"
 #include "sprite.h"
 #include "palette.h"
+#include "constants/rgb.h"
 
 const u32 gBitTable[] =
 {
@@ -271,8 +272,8 @@ void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor)
         s8 g = data1->g;
         s8 b = data1->b;
         struct PlttData *data2 = (struct PlttData *)&blendColor;
-        gPlttBufferFaded[index] = ((r + (((data2->r - r) * coeff) >> 4)) << 0)
-                                | ((g + (((data2->g - g) * coeff) >> 4)) << 5)
-                                | ((b + (((data2->b - b) * coeff) >> 4)) << 10);
+        gPlttBufferFaded[index] = RGB(r + (((data2->r - r) * coeff) >> 4),
+                                      g + (((data2->g - g) * coeff) >> 4),
+                                      b + (((data2->b - b) * coeff) >> 4));
     }
 }