diff --git a/data/layouts/BudportCity/map.bin b/data/layouts/BudportCity/map.bin
index c5fbddc9b..9c5c2a030 100644
Binary files a/data/layouts/BudportCity/map.bin and b/data/layouts/BudportCity/map.bin differ
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 35f3609de..d68fd6dca 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -4446,7 +4446,7 @@
       "name": "BudportCity_Layout",
       "width": 46,
       "height": 40,
-      "primary_tileset": "gTileset_GeneralWithStairs",
+      "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Budport",
       "border_filepath": "data/layouts/BudportCity/border.bin",
       "blockdata_filepath": "data/layouts/BudportCity/map.bin"
diff --git a/data/maps/BudportCity/map.json b/data/maps/BudportCity/map.json
index fd1af472e..2efb4bb94 100644
--- a/data/maps/BudportCity/map.json
+++ b/data/maps/BudportCity/map.json
@@ -3,7 +3,7 @@
   "name": "BudportCity",
   "layout": "LAYOUT_BUDPORT_CITY",
   "music": "MUS_SLATEPORT",
-  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "region_map_section": "MAPSEC_BUDPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_NONE",
diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json
index f073a7436..73aea8287 100644
--- a/data/maps/DewfordTown/map.json
+++ b/data/maps/DewfordTown/map.json
@@ -128,7 +128,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
index 58978b7ff..6e0b5f707 100644
--- a/data/maps/EverGrandeCity/map.json
+++ b/data/maps/EverGrandeCity/map.json
@@ -19,7 +19,9 @@
       "direction": "left"
     }
   ],
-  "object_events": [],
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 18,
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
index 4888640a5..f59fd7716 100644
--- a/data/maps/FallarborTown/map.json
+++ b/data/maps/FallarborTown/map.json
@@ -115,7 +115,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json
index 007d8b22d..9efc51a7f 100644
--- a/data/maps/FortreeCity/map.json
+++ b/data/maps/FortreeCity/map.json
@@ -182,7 +182,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
index 398cf219e..8d43ea846 100644
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@@ -412,7 +412,9 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index f4da4222b..eda6ec7fe 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -230,7 +230,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 9bc6fed67..fde327a18 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -295,7 +295,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
index 5a0a38dc9..8c99ac285 100644
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@@ -100,7 +100,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json
index ee15509cd..c7ff529db 100644
--- a/data/maps/Route107/map.json
+++ b/data/maps/Route107/map.json
@@ -117,7 +117,13 @@
       "flag": "0"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json
index 405ae3401..2f580cb04 100644
--- a/data/maps/Route108/map.json
+++ b/data/maps/Route108/map.json
@@ -126,7 +126,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 17c483c0f..e7a6ad4c1 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -414,7 +414,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index ee0d71349..7b9f9f9c4 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -348,7 +348,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "secret_base",
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index 80304ddf4..ccf67bbcd 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -347,7 +347,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index 21e2ecd06..cd9f5b5cc 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -206,7 +206,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index 464aa83fc..3749f30e9 100644
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@@ -166,8 +166,12 @@
       "flag": "0"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",
diff --git a/data/maps/Underwater_Route105/map.json b/data/maps/Underwater_Route105/map.json
index 069ccab4d..b276de28d 100644
--- a/data/maps/Underwater_Route105/map.json
+++ b/data/maps/Underwater_Route105/map.json
@@ -19,7 +19,9 @@
       "direction": "emerge"
     }
   ],
-  "object_events": [],
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 13,
@@ -36,6 +38,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }
diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json
index ae40730c0..2d1df93ed 100644
--- a/data/maps/VerdanturfTown/map.json
+++ b/data/maps/VerdanturfTown/map.json
@@ -129,7 +129,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
diff --git a/data/tilesets/primary/general/metatile_attributes.bin b/data/tilesets/primary/general/metatile_attributes.bin
index d9cd29016..0b61bf2db 100644
Binary files a/data/tilesets/primary/general/metatile_attributes.bin and b/data/tilesets/primary/general/metatile_attributes.bin differ
diff --git a/data/tilesets/primary/general/metatiles.bin b/data/tilesets/primary/general/metatiles.bin
index af899bcc5..b369fee08 100644
Binary files a/data/tilesets/primary/general/metatiles.bin and b/data/tilesets/primary/general/metatiles.bin differ
diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png
index 17426ab80..478d12434 100644
Binary files a/data/tilesets/primary/general/tiles.png and b/data/tilesets/primary/general/tiles.png differ
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 7e38f2b64..0479e46e9 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1383,7 +1383,7 @@
 #define FLAG_IS_CHAMPION                            (SYSTEM_FLAGS + 0x1F) // Seems to be related to linking.
 #define FLAG_NURSE_UNION_ROOM_REMINDER              (SYSTEM_FLAGS + 0x20)
 
-#define FLAG_UNUSED_0x881                           (SYSTEM_FLAGS + 0x21) // Unused Flag
+#define FLAG_VISITED_BUDPORT_CITY                   (SYSTEM_FLAGS + 0x21) // Unused Flag
 #define FLAG_UNUSED_0x882                           (SYSTEM_FLAGS + 0x22) // Unused Flag
 #define FLAG_UNUSED_0x883                           (SYSTEM_FLAGS + 0x23) // Unused Flag
 #define FLAG_UNUSED_0x884                           (SYSTEM_FLAGS + 0x24) // Unused Flag
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index e3dd15000..6162cf5c2 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -92,7 +92,9 @@
 #define MAX_STAT_STAGE    12
 
 // Shiny odds
-#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
+#define SHINY_ODDS 16 // Actual probability is SHINY_ODDS/65536
+                      // Emerald default is 1/8196 (8/65536)
+                      // Gen VI+ default is 1/4096 (16/65536)
 
 // Ribbon IDs used by TV and Pokénav
 #define CHAMPION_RIBBON       0
diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h
index 5b8029acf..529524b31 100644
--- a/include/constants/region_map_sections.h
+++ b/include/constants/region_map_sections.h
@@ -216,6 +216,9 @@
 #define MAPSEC_TRAINER_HILL                 0xD4
 #define MAPSEC_NONE                         0xD5
 
+// New MAPSECS
+#define MAPSEC_BUDPORT_CITY                 0xD6
+
 #define METLOC_SPECIAL_EGG                  0xFD
 #define METLOC_IN_GAME_TRADE                0xFE
 #define METLOC_FATEFUL_ENCOUNTER            0xFF
diff --git a/src/data/region_map/region_map_sections.json b/src/data/region_map/region_map_sections.json
index 8fa007911..e82cdcb02 100644
--- a/src/data/region_map/region_map_sections.json
+++ b/src/data/region_map/region_map_sections.json
@@ -1,5 +1,13 @@
 {
   "map_sections": [
+    {
+      "map_section": "MAPSEC_BUDPORT_CITY",
+      "name": "BUDPORT CITY",
+      "x": 2,
+      "y": 2,
+      "width": 1,
+      "height": 1
+    },
     {
       "map_section": "MAPSEC_LITTLEROOT_TOWN",
       "name": "LITTLEROOT TOWN",
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 07e4f9870..184e3e968 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -71,6 +71,7 @@ static const u16 sMapPopUp_Palette_Underwater[16] = INCBIN_U16("graphics/map_pop
 
 static const u8 sRegionMapSectionId_To_PopUpThemeIdMapping[] =
 {
+    [MAPSEC_BUDPORT_CITY] = MAPPOPUP_THEME_MARBLE,
     [MAPSEC_LITTLEROOT_TOWN] = MAPPOPUP_THEME_WOOD,
     [MAPSEC_OLDALE_TOWN] = MAPPOPUP_THEME_WOOD,
     [MAPSEC_DEWFORD_TOWN] = MAPPOPUP_THEME_WOOD,
diff --git a/src/region_map.c b/src/region_map.c
index 7d5fe9365..14d363057 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -288,6 +288,7 @@ static const u32 sFlyTargetIcons_Gfx[] = INCBIN_U32("graphics/pokenav/region_map
 
 static const u8 sMapHealLocations[][3] =
 {
+    [MAPSEC_BUDPORT_CITY] = {MAP_GROUP(BUDPORT_CITY), MAP_NUM(BUDPORT_CITY), HEAL_LOCATION_BUDPORT_CITY},
     [MAPSEC_LITTLEROOT_TOWN] = {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F},
     [MAPSEC_OLDALE_TOWN] = {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN},
     [MAPSEC_DEWFORD_TOWN] = {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN},
@@ -1178,6 +1179,8 @@ static u8 GetMapsecType(u16 mapSecId)
     {
     case MAPSEC_NONE:
         return MAPSECTYPE_NONE;
+    case MAPSEC_BUDPORT_CITY:
+        return FlagGet(FLAG_VISITED_BUDPORT_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
     case MAPSEC_LITTLEROOT_TOWN:
         return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
     case MAPSEC_OLDALE_TOWN: