Navel Rock improvement (Exterior, interior and fork)

data/layouts/NavelRock_B1F/map.bin

@@ -1 +1,2 @@
-
22
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2?2
2GGGGGGGGGGGGGGGGGGGGG
+/

22

2
22
2
2
2
2
2
2
2

222
2	
+
2
2
2

2
2
22
2$/
2
2
2

2
2
22
2


2/
2
2
22
2
2
2
2
2
222
2
2
222		$
2
2/
2
2
222
2
2
2
2/
?2
2GGGGGGGGGGG$
#GGGG

data/layouts/NavelRock_Entrance/map.bin

@@ -1 +1 @@
-
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2?2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2ﾜGGGGﾒ
2
2
2
2
2
2
2ﾐGGGGGﾒ
2
2
2
2ﾕﾐ
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2ﾙ
2
2
2
2ﾕ
2
2
2
2
2
2
2
2
2
2
2
2
2
2ﾕ
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
22
2
2GGXYZGGGGGGGGGGG
+
2
2
2
2
2
2
2
2?2
2
2
2
2
2ﾕ
2
2
2
2
2
2
2
2ﾕ
2
2
2
2ﾕ
2
2
2
2
2
2
2
2
2ﾕ
2
2
2
2
2ﾕ
2ﾕ
2
2
2ﾕ
2
2
2
2ﾕ
2
2
2
2ﾕ
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2ﾕ
2
2ﾕ
2
2
2
2
2
2
2
2ﾕ
2
2ﾜGGGGﾒ
ﾕ
2
2ﾕ
2
2ﾐGGGGGﾒ
2
2
2
2ﾕﾐ
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2ﾙ
2LRMﾕ
2
2
2
2
2
2
2
2
2
2
2
2
2
2ﾕ
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
22
2
2GGXYZGGGGGGGGGGG

data/layouts/NavelRock_Fork/map.bin

@@ -1 +1 @@
-
22
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2?2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2GGGGGGGGGGв
2
2
2аGGGGGGGGGG
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2

2
2

2
2


2
2

2
2

2
2

2
2

2
2

2
2

2
2

2
2

2
2

2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2аGGGGGGGGGG
2
2а
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2GGGGGGGGGGв
2
2в
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2гст
2рсдгт
2рсд2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2GGGGGGGGGGGGGGGG
+
22
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2?2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2GGGGGGGGGGв
2
2
2аGGGGGGGGGG
2
25
2
2
2
25
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2аGGGGGGGGGG
2
2а
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2GGGGGGGGGGв
2
2в
2
25
2
2
2
2
2
2
2
2
2
2
2
2
2
25
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2аGGGGGGGGGG
2
2а
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2GGGGGGGGGGв
2
2в
2
2гст
2рсдгт
2рсд2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2GGGGGGGGGGGGGGGG

data/layouts/layouts.json

@@ -4214,8 +4214,8 @@
     {
       "id": "LAYOUT_NAVEL_ROCK_EXTERIOR",
       "name": "NavelRock_Exterior_Layout",
-      "width": 21,
-      "height": 24,
+      "width": 40,
+      "height": 40,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Dewford",
       "border_filepath": "data/layouts/NavelRock_Exterior/border.bin",

data/maps/NavelRock_Entrance/map.json

@@ -4,7 +4,7 @@
   "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE",
   "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
-  "requires_flash": false,
+  "requires_flash": true,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
   "allow_cycling": false,
@@ -18,8 +18,8 @@
   ],
   "warp_events": [
     {
-      "x": 10,
-      "y": 5,
+      "x": 14,
+      "y": 3,
       "elevation": 3,
       "dest_map": "MAP_NAVEL_ROCK_B1F",
       "dest_warp_id": "0"

data/maps/NavelRock_Exterior/map.json

@@ -6,7 +6,7 @@
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
+  "map_type": "MAP_TYPE_ROUTE",
   "allow_cycling": true,
   "allow_escaping": false,
   "allow_running": true,
@@ -18,15 +18,15 @@
   ],
   "warp_events": [
     {
-      "x": 10,
-      "y": 18,
+      "x": 20,
+      "y": 27,
       "elevation": 0,
       "dest_map": "MAP_NAVEL_ROCK_HARBOR",
       "dest_warp_id": "0"
     },
     {
-      "x": 10,
-      "y": 10,
+      "x": 21,
+      "y": 6,
       "elevation": 0,
       "dest_map": "MAP_NAVEL_ROCK_ENTRANCE",
       "dest_warp_id": "1"

include/constants/map_groups.h

@@ -628,6 +628,4 @@
 
 #define MAP_GROUPS_COUNT 34
 
-// static const u8 MAP_GROUP_COUNT[] = {57, 5, 6, 7, 8, 9, 10, 8, 8, 15, 9, 18, 11, 24, 14, 16, 17, 2, 2, 2, 3, 1, 1, 1, 126, 61, 90, 2, 1, 13, 1, 1, 3, 1, 0};
-
 #endif // GUARD_CONSTANTS_MAP_GROUPS_H

include/constants/metatile_labels.h

@@ -140,6 +140,7 @@
 #define METATILE_Contest_WallShadow          0x221
 
 // gTileset_Dewford
+#define METATILE_Dewford_DeepSandCenter    0x314
 #define METATILE_Dewford_Door              0x225
 #define METATILE_Dewford_Door_BattleTower  0x25D
 

src/data/wild_encounters.json

@@ -33796,6 +33796,282 @@
               }
             ]
           }
+        },
+        {
+          "map": "MAP_NAVEL_ROCK_ENTRANCE",
+          "base_label": "gNavelRock_Entrance0",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 20,
+                "max_level": 24,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 26,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 27,
+                "max_level": 29,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 21,
+                "max_level": 25,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 20,
+                "max_level": 23,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 28,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 22,
+                "max_level": 28,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 24,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 31,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 28,
+                "max_level": 31,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 30,
+                "max_level": 32,
+                "species": "SPECIES_ONIX"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_NAVEL_ROCK_B1F",
+          "base_label": "gNavelRock_B1F0",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 22,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 25,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 24,
+                "max_level": 32,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 23,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 25,
+                "max_level": 33,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 26,
+                "max_level": 31,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 24,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 31,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 33,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 32,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 29,
+                "max_level": 31,
+                "species": "SPECIES_KADABRA"
+              },
+              {
+                "min_level": 30,
+                "max_level": 34,
+                "species": "SPECIES_ONIX"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_NAVEL_ROCK_FORK",
+          "base_label": "gNavelRock_Fork0",
+          "land_mons": {
+            "encounter_rate": 10,
+            "mons": [
+              {
+                "min_level": 24,
+                "max_level": 30,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 25,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 22,
+                "max_level": 33,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 26,
+                "max_level": 34,
+                "species": "SPECIES_ABRA"
+              },
+              {
+                "min_level": 20,
+                "max_level": 32,
+                "species": "SPECIES_GEODUDE"
+              },
+              {
+                "min_level": 22,
+                "max_level": 32,
+                "species": "SPECIES_ZUBAT"
+              },
+              {
+                "min_level": 26,
+                "max_level": 31,
+                "species": "SPECIES_GOLBAT"
+              },
+              {
+                "min_level": 29,
+                "max_level": 32,
+                "species": "SPECIES_KADABRA"
+              },
+              {
+                "min_level": 28,
+                "max_level": 34,
+                "species": "SPECIES_GRAVELER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 29,
+                "species": "SPECIES_GASTLY"
+              },
+              {
+                "min_level": 29,
+                "max_level": 34,
+                "species": "SPECIES_ONIX"
+              },
+              {
+                "min_level": 29,
+                "max_level": 35,
+                "species": "SPECIES_ONIX"
+              }
+            ]
+          }
+        },
+        {
+          "map": "MAP_NAVEL_ROCK_EXTERIOR",
+          "base_label": "gNavelRock_Exterior0",
+          "land_mons": {
+            "encounter_rate": 5,
+            "mons": [
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 30,
+                "max_level": 32,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 20,
+                "max_level": 21,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_KRABBY"
+              },
+              {
+                "min_level": 20,
+                "max_level": 22,
+                "species": "SPECIES_WINGULL"
+              },
+              {
+                "min_level": 20,
+                "max_level": 25,
+                "species": "SPECIES_HOPPIP"
+              },
+              {
+                "min_level": 25,
+                "max_level": 25,
+                "species": "SPECIES_HOPPIP"
+              },
+              {
+                "min_level": 30,
+                "max_level": 31,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 29,
+                "max_level": 31,
+                "species": "SPECIES_PELIPPER"
+              },
+              {
+                "min_level": 25,
+                "max_level": 26,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 24,
+                "max_level": 26,
+                "species": "SPECIES_SANDSHREW"
+              },
+              {
+                "min_level": 30,
+                "max_level": 33,
+                "species": "SPECIES_SANDSLASH"
+              }
+            ]
+          }
         }
       ]
     },