diff --git a/data/event_scripts.s b/data/event_scripts.s
index 7df9d963a..9589c40a6 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1096,3 +1096,5 @@ Common_EventScript_LegendaryFlewAway::
 	.include "data/maps/Route116Ext/scripts.inc"
 
 	.include "data/maps/Route101West/scripts.inc"
+
+	.include "data/maps/Route117North/scripts.inc"
diff --git a/data/layouts/Route101ext/map.bin b/data/layouts/Route101ext/map.bin
index d5f779480..c94ea3097 100644
--- a/data/layouts/Route101ext/map.bin
+++ b/data/layouts/Route101ext/map.bin
@@ -1,2 +1,2 @@
 ���pPQPQppppppppp�%%�pppXYXYppppppppp����pppppppppppppppp����ppppppppppppp			
-00000000�ppp�0
0�1�1�1�1
0
0
0
0�ppp�
00����
0
0
0�0�pp�
0 !"
0����
0
0
0
00000
0B
0
0
0
0
0�1�1�1�1�1
0
0
0
0
0
08IIJ
0
0
0
0
0�1�1�1�1�1�1
0
000
0@
0
0
0
0
00
0
0�1�1
0�1�1�1
0
0&0'0
0@0
0
0
0�
0
0
0
0
0
0�1�1�1
0
0
0
0
0@
0
0
0
0
0
0
0
0�0�0�0
0�1�1�1�1
0
0
0@�1�1
0
0
0
0
0
0�0�0�0�0�1�1�1�1�1
0
0@��
0
0
0
0
0
00�0�0�0
0
0�1�1�1�1
0@��
0
0
0
0
0
0
0
0�0�0�0�0
0�1�1�1�1@
0
0
0
0
0
0
0
0
0
0�0�0�0�0
0
0�1�1�1HIIII
0III
0
0
0�0�0�0
0
0
0�1�1�1
0
0
0
0
0
0
0
0
0
00�0�0�0
0�1�1
0�1�1
0
0
0�1�1
0
0
0
0�0�0�0�0
0
0��
0�1�1
0
0
0��
0
0
00�0�0�0�0
0
0��
0�1�1
0
0
0��
0
0
0
0�0�0
0
0
0
0
0
0�1�1�1
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0�1�1�1�1�1
0
0
0
0
0
0�1�1�0�0�0
0
0
0�1�1�1�1�1
0�1�1
0
0
0
0��
0�1�1
0
0�1�1�1�1
0
0
0��
0
0
0
0��
0��
0
0�1�1�1
0
0
0
0��
0
0
0
0
0
0
0��
0
0�1�1�1
0
0
0
0
0
0
0
00
0
0
0
0
0
0
0
0�1�1�1
0
0
0
0
0
0
0
0
0
0�1�1�1�1
0�1�1�1�1�1
0
0
0
0
0
0
0
0
0
0���1�1�1�1�1�1�1
0
0
0
00
0
0
0
0
0
0���1�1�1�1
0
0
0
0
0
0
0
0
0
0
0�1�1
0
00�1�1�1
0
0�1�1
0
0
0
0
0
0
0
0��
0�1�1
0
0
0
0
0��
0
0
0
0
0
0
0
0��
0��
0
0
0
0
0��
0
0
0
0
0�1�1
0
0
0
0��
0
0
0
0
0
0
0
0
0
00
0��
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�1�1
0
0
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0
0
0
0
0
0
00
0
0
0
0
0
0
0��
0
0�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1
\ No newline at end of file
+00000000�ppp�0
0�1�1�1�1
0
0
0
0�ppp�
00����
0
0
0�0�pp�
0 !"
0����
0
0
0
00000
0B
0
0
0
0
0�1�1�1�1�1
0
0
0
0
0
08IIJ
0
0
0
0
0�1�1�1�1�1�1
0
000
0@
0
0
0
0
00
0
0�1�1
0�1�1�1
0
0&0'0
0@0
0
0
0�
0
0
0
0
0
0�1�1�1
0
0
0
0
0@
0
0
0
0
0
0
0
0�0�0�0
0�1�1�1�1
0
0
0@�1�1
0
0
0
0
0
0�0�0�0�0�1�1�1�1�1
0
0@��
0
0
0
0
0
00�0�0�0
0
0�1�1�1�1
0@��
0
0
0
0
0
0
0
0�0�0�0�0
0�1�1�1�1@
0
0
0
0
0
0
0
0
0
0�0�0�0�0
0
0�1�1�1HIIII
0III
0
0
0�0�0�0
0
0
0�1�1�1
0
0
0
0
0
0
0
0
0
00�0�0�0
0�1�1
0�1�1
0
0
0�1�1
0
0
0
0�0�0�0�0
0
0��
0�1�1
0
0
0��
0
0
00�0�0�0�0
0
0��
0�1�1
0
0
0��
0
0
0
0�0�0
0
0
0
0
0
0�1�1�1
0
0
0
0
0
0
0
0�0�0�0
0
0
0
0�1�1�1�1�1
0
0
0
0
0
0�1�1�0�0�0
0
0
0�1�1�1�1�1
0�1�1
0
0
0
0��
0�1�1
0
0�1�1�1�1
0
0
0��
0
0
0
0��
0��
0
0�1�1�1
0
0
0
0��
0
0
0
0
0
0
0��
0
0�1�1�1
0
0
0
0
0
0
0
00
0
0
0
0
0
0
0
0�1�1�1
0
0
0
0
0
0
0
0
0
0�1�1�1�1
0�1�1�1�1�1
0
0
0
0
0
0
0
0
0
0���1�1�1�1�1�1�1
0
0
0
00
0
0
0
0
0
0���1�1�1�1
0
0
0
0
0
0
0
0
0
0
0�1�1
0
00�1�1�1
0
0�1�1
0
0
0
0
0
0
0
0��
0�1�1
0
0
0
0
0��
0
0
0
0
0
0
0
0��
0��
0
0
0
0
0��
0
0
0
0
0�1�1
0
0
0
0��
0
0
0
0
0
0
0
0
0
00
0��
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�1�1
0
0
0
00
0
0
0
0
0
0
0
0
0
0
0
0
0��
0
0
0
0
0
0
0
0
0
00
0
0
0
0
0
0
0��
0�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1
\ No newline at end of file
diff --git a/data/layouts/Route111/map.bin b/data/layouts/Route111/map.bin
index 4ce11a8a9..6216fb9ca 100644
Binary files a/data/layouts/Route111/map.bin and b/data/layouts/Route111/map.bin differ
diff --git a/data/layouts/Route117/map.bin b/data/layouts/Route117/map.bin
index bdeda9cd4..421fba9fe 100644
--- a/data/layouts/Route117/map.bin
+++ b/data/layouts/Route117/map.bin
@@ -1,6 +1,6 @@
-����������������567
0
2
0
0
0�0�0�0�00
0
0
0
-2
0
0
0
0
0
0
0
0��������
0
0
0
0
0
0
0
0���������h4s4q0u4i0j40
0
0
2
0�0�0�0�04
0
0
0
0
0
0
0
0
0
0
0
0�������
0
0
0
0
0
0
0
0
0
0
0
0
0
0���������p4{4|4}4q0r44
0
0
0
0�0�0�0�0
0
0
00	0	0
-0
0
00
0
0
0�������8IIIIII:
0
0
0
0
0
0
0����������p4q0q0t4y4z4
0
0
00�0�0�0
02
0
02
0
04
0
0
0�������@222
+������������������0p0k0l0m0q0r0
0
2
0
0
0�0�0�0�00
0
0
0
+2
0
0
0
0
0
0
0
0��������
0
0
0
0
0
0
0
0����������p4s4q0u4q0r40
0
0
2
0�0�0�0�04
0
0
0
0
0
0
0
0
0
0
0
0�������
0
0
0
0
0
0
0
0
0
0
0
0
0
0����������p4{4|4}4q0r44
0
0
0
0�0�0�0�0
0
0
00	0	0
+0
0
00
0
0
0�������8IIIIII:
0
0
0
0
0
0
0����������p4q0q0t4y4z4
0
0
00�0�0�0
02
0
02
0
04
0
0
0�������@222
 222B
0
0
0
0
0
0
 2����������x4y4y4z4
0
0
0
0
04�0�0�0
0
0
02
0
0
0
0
0
0
0�����@22222
 2B
0
0
0
0
0
0
00000���������������������
0� !"������2
0@222222B
0
0
0
0
0
0
0
0
0
diff --git a/data/layouts/Route117North/border.bin b/data/layouts/Route117North/border.bin
new file mode 100644
index 000000000..2102f16d1
Binary files /dev/null and b/data/layouts/Route117North/border.bin differ
diff --git a/data/layouts/Route117North/map.bin b/data/layouts/Route117North/map.bin
new file mode 100644
index 000000000..e4ccaa6cb
--- /dev/null
+++ b/data/layouts/Route117North/map.bin
@@ -0,0 +1,3 @@
+�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0p0s0s0s0s0q0q0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0p0s0s0s0s0q0q0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0p0s0s0s0s0q0q0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0p0s0s0s0s0q0q0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0p0s0s0s0s0q0q0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0p0s0s0s0{0|0|0�0�0�0�0�0�0�0�0�0�0�0�0&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2p0s0s0s0q0q0q0�0�0�0�0�0�0�0�0�0�0�0�0
0
0
0
0
02
0
+222
2222	2
+22
0
222p0s0s0s0q0q0q0�0�0�0�0�0�0�0�0�0�0�0&2
0
0
0
0
02222
0
0
0
022
022222p0s0s0{0|0|0|0�0�0�0�0�0�0�0�0�0�0�0
0
02
02
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0p0s0s0q0q0q0q0�0�0�0�0�0�0�0�0&2&2&2
0
0
0
00
0
0
0
0
0
0
022
0
0
0220
0
0p0s0{0y0y0y0y0�0�0�0�0�0�0�0�0�2�2�2�2�2�2�2�22
0
0
022
0
0
0
0
0
0
0
00
0
0p0p000000�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2
0
0
0
02
0
0
02
0
0
002
0
0
0p0p0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2
0
02
0
0
0
02
0
0
0
0
0
0
0
0
0p0x0y0y0y0y0y0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2
0
00
0
0
0
0
002
0
0
0
0
0
0
0p0
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2
0
00
0�0�0�0
0
0
022
0
0
0
0
0p0
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2
0
0
0
0�0�0�0
0
0
0
022
0
0
0
0p0
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2
0
0
0
0�0�0�0�0�0
0
0
0
0
0
0
0
0x0y0y0y0y0y0y0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�2
0
0
0
0�0�0�0�0�0�0�0
0
0
0
022
0
0
0
0
0
0
0�0�0�0�0�0�0�0�0�0�0�0�0�0�0�0i0i0j0
0
0
0
0
0�0�0�0�0
0
0
02
02
0
0
0
0
0
0
0
\ No newline at end of file
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 9ff8fbd8b..91d5a8858 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -4590,6 +4590,16 @@
       "secondary_tileset": "gTileset_Petalburg",
       "border_filepath": "data/layouts/Route101West/border.bin",
       "blockdata_filepath": "data/layouts/Route101West/map.bin"
+    },
+    {
+      "id": "LAYOUT_ROUTE117NORTH",
+      "name": "Route117North_Layout",
+      "width": 40,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Mauville",
+      "border_filepath": "data/layouts/Route117North/border.bin",
+      "blockdata_filepath": "data/layouts/Route117North/map.bin"
     }
   ]
 }
diff --git a/data/maps/GraniteCave_B3F/scripts.inc b/data/maps/GraniteCave_B3F/scripts.inc
index 18cfe7239..a01f189ad 100644
--- a/data/maps/GraniteCave_B3F/scripts.inc
+++ b/data/maps/GraniteCave_B3F/scripts.inc
@@ -156,7 +156,6 @@ GraniteCave_B3F_EventScript_Agron::
 	lock
 	//Setup Scene
 	fadeoutbgm 1
-	animateflash 1
 	//Start Look Around
 	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_B3F_Movement_CheckRightLeft
 	waitmovement 0
diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json
index e01d025df..37aff2504 100644
--- a/data/maps/LittlerootTown/map.json
+++ b/data/maps/LittlerootTown/map.json
@@ -13,15 +13,15 @@
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [
-    {
-      "map": "MAP_ROUTE101",
-      "offset": 0,
-      "direction": "up"
-    },
     {
       "map": "MAP_ROUTE101WEST",
       "offset": -20,
       "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE101",
+      "offset": 0,
+      "direction": "up"
     }
   ],
   "object_events": [
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index eda6ec7fe..d1f96fed7 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -32,6 +32,11 @@
       "map": "MAP_ROUTE118",
       "offset": 0,
       "direction": "right"
+    },
+    {
+      "map": "MAP_ROUTE117NORTH",
+      "offset": -40,
+      "direction": "up"
     }
   ],
   "object_events": [
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index ac34c0d13..8859178fd 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -110,8 +110,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
-      "x": 11,
-      "y": 28,
+      "x": 7,
+      "y": 20,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json
index 5f58951b9..2196301ec 100644
--- a/data/maps/PetalburgWoods/map.json
+++ b/data/maps/PetalburgWoods/map.json
@@ -105,8 +105,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
-      "x": 4,
-      "y": 8,
+      "x": 12,
+      "y": 6,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
diff --git a/data/maps/PetalburgWoodsExt/map.json b/data/maps/PetalburgWoodsExt/map.json
index 921345a4b..5e657162b 100644
--- a/data/maps/PetalburgWoodsExt/map.json
+++ b/data/maps/PetalburgWoodsExt/map.json
@@ -58,8 +58,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
-      "x": 32,
-      "y": 35,
+      "x": 31,
+      "y": 34,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH",
       "movement_range_x": 0,
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index 319a107b0..b34a4d909 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -18,11 +18,6 @@
       "offset": 0,
       "direction": "up"
     },
-    {
-      "map": "MAP_LITTLEROOT_TOWN",
-      "offset": 0,
-      "direction": "down"
-    },
     {
       "map": "MAP_ROUTE101EXT",
       "offset": -20,
@@ -32,6 +27,11 @@
       "map": "MAP_ROUTE101WEST",
       "offset": 0,
       "direction": "left"
+    },
+    {
+      "map": "MAP_LITTLEROOT_TOWN",
+      "offset": 0,
+      "direction": "down"
     }
   ],
   "object_events": [
diff --git a/data/maps/Route101West/scripts.inc b/data/maps/Route101West/scripts.inc
index d7c476bf9..152e3f2c3 100644
--- a/data/maps/Route101West/scripts.inc
+++ b/data/maps/Route101West/scripts.inc
@@ -8,7 +8,7 @@ Route101West_EventScript_Scientist::
 Route101West_Text_Scientist:
 	.string "Professor BIRCH sent me out here looking\n"
 	.string "for a POKéMON that's not native to this.\l"
-	.string "area./p"
+	.string "area.\p"
 	.string "I can't wait to be done with grad school...$"
 
 Route101West_EventScript_Girl::
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index a06749c08..c984e61c1 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -297,7 +297,7 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
-      "x": 0,
+      "x": 1,
       "y": 8,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
@@ -310,7 +310,7 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
-      "x": 0,
+      "x": 1,
       "y": 9,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
@@ -323,7 +323,7 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_PICNICKER",
-      "x": 1,
+      "x": 2,
       "y": 8,
       "elevation": 0,
       "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index 30ada2876..e1130ef3c 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -297,8 +297,8 @@
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
-      "x": 39,
-      "y": 15,
+      "x": 40,
+      "y": 7,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
       "movement_range_x": 0,
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index bc476ebaa..2dbd61569 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -27,6 +27,11 @@
       "map": "MAP_ROUTE112",
       "offset": 20,
       "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE117NORTH",
+      "offset": 120,
+      "direction": "left"
     }
   ],
   "object_events": [
diff --git a/data/maps/Route116Ext/scripts.inc b/data/maps/Route116Ext/scripts.inc
index 7d3bca27e..ec52f329f 100644
--- a/data/maps/Route116Ext/scripts.inc
+++ b/data/maps/Route116Ext/scripts.inc
@@ -35,15 +35,14 @@ Route116Ext_EventScript_Kate::
 	end
 	
 Route116Ext_EventScript_BayLeaf::
-	lock
 	faceplayer
 	playmoncry SPECIES_BAYLEEF, 0
 	waitmoncry
 	delay 32
 	setwildbattle SPECIES_BAYLEEF, 17
+	dowildbattle
 	waitstate
 	removeobject 5
 	setflag FLAG_BAYLEAF_ENCOUNTERED 
-	release
 	end
 	
\ No newline at end of file
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index ccf67bbcd..5fa63e8e6 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -22,6 +22,11 @@
       "map": "MAP_MAUVILLE_CITY",
       "offset": 0,
       "direction": "right"
+    },
+    {
+      "map": "MAP_ROUTE117NORTH",
+      "offset": 20,
+      "direction": "up"
     }
   ],
   "object_events": [
@@ -336,6 +341,19 @@
       "trainer_sight_or_berry_tree_id": "4",
       "script": "Route117_EventScript_Melina",
       "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_SQUIRTLE",
+      "x": 44,
+      "y": 2,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 2,
+      "movement_range_y": 2,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
     }
   ],
   "warp_events": [
diff --git a/data/maps/Route117North/map.json b/data/maps/Route117North/map.json
new file mode 100644
index 000000000..aee91587d
--- /dev/null
+++ b/data/maps/Route117North/map.json
@@ -0,0 +1,44 @@
+{
+  "id": "MAP_ROUTE117NORTH",
+  "name": "Route117North",
+  "layout": "LAYOUT_ROUTE117NORTH",
+  "music": "MUS_ROUTE118",
+  "region_map_section": "MAPSEC_ROUTE_117",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "map": "MAP_ROUTE111",
+      "offset": -120,
+      "direction": "right"
+    },
+    {
+      "map": "MAP_MAUVILLE_CITY",
+      "offset": 40,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE117",
+      "offset": -20,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}
diff --git a/data/maps/Route117North/scripts.inc b/data/maps/Route117North/scripts.inc
new file mode 100644
index 000000000..6e9ff4b71
--- /dev/null
+++ b/data/maps/Route117North/scripts.inc
@@ -0,0 +1,2 @@
+Route117North_MapScripts::
+	.byte 0
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index bb65bf268..272618769 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -242,19 +242,6 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "RustboroCity_EventScript_Boy1",
       "flag": "0"
-    },
-    {
-      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
-      "x": 34,
-      "y": 32,
-      "elevation": 0,
-      "movement_type": "MOVEMENT_TYPE_NONE",
-      "movement_range_x": 0,
-      "movement_range_y": 0,
-      "trainer_type": "TRAINER_TYPE_NONE",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "Eventscript_GiveTestngPokemon",
-      "flag": "0"
     }
   ],
   "warp_events": [
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index f857594de..f8b8b8a52 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -102,7 +102,8 @@
     "NewMap2",
     "RustboroCityEast",
     "Route116Ext",
-    "Route101West"
+    "Route101West",
+    "Route117North"
   ],
   "gMapGroup_IndoorLittleroot": [
     "LittlerootTown_BrendansHouse_1F",
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index 45d41ed4b..39029ede7 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -464,5 +464,6 @@
 #define LAYOUT_PETALBURF_FORREST_RIVER 457
 #define LAYOUT_ROUTE116EXT 458
 #define LAYOUT_ROUTE101WEST 459
+#define LAYOUT_ROUTE117NORTH 460
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 3be8d274c..8f65ea99e 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -73,6 +73,7 @@
 #define MAP_RUSTBORO_CITY_EAST                   (64 | (0 << 8))
 #define MAP_ROUTE116EXT                          (65 | (0 << 8))
 #define MAP_ROUTE101WEST                         (66 | (0 << 8))
+#define MAP_ROUTE117NORTH                        (67 | (0 << 8))
 
 // gMapGroup_IndoorLittleroot
 #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    (0 | (1 << 8))
diff --git a/src/data/map_group_count.h b/src/data/map_group_count.h
index db832fbdf..886b21b3a 100644
--- a/src/data/map_group_count.h
+++ b/src/data/map_group_count.h
@@ -1 +1 @@
-static const u8 MAP_GROUP_COUNT[] = {67, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 114, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
+static const u8 MAP_GROUP_COUNT[] = {68, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 114, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 38a641e61..5604664cb 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -3468,7 +3468,7 @@ static const struct TrainerMonItemCustomMoves sParty_Drake[] = {
 static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = {
     {
     .iv = 100,
-    .lvl = 12,
+    .lvl = 10,
     .species = SPECIES_GEODUDE,
     .heldItem = ITEM_NONE,
     .moves = {MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB}
@@ -3486,6 +3486,13 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = {
     .species = SPECIES_NOSEPASS,
     .heldItem = ITEM_ORAN_BERRY,
     .moves = {MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB}
+    },
+	{
+    .iv = 200,
+    .lvl = 16,
+    .species = SPECIES_LILEEP,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = {MOVE_MEGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_ACID, MOVE_ROCK_TOMB}
     }
 };
 
@@ -3505,11 +3512,18 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = {
     .moves = {MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP}
     },
     {
-    .iv = 200,
+    .iv = 150,
     .lvl = 19,
     .species = SPECIES_MAKUHITA,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = {MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP}
+    .moves = {MOVE_ARM_THRUST, MOVE_NONE, MOVE_BATON_PASS, MOVE_BULK_UP}
+    },
+    {
+    .iv = 200,
+    .lvl = 21,
+    .species = SPECIES_BRELOOM,
+    .heldItem = ITEM_SITRUS_BERRY,
+    .moves = {MOVE_BULLET_SEED, MOVE_THUNDER_PUNCH, MOVE_MACH_PUNCH, MOVE_BULK_UP}
     }
 };
 
diff --git a/src/data/trainers.h b/src/data/trainers.h
index b7b24a01e..a043736d4 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -3202,7 +3202,7 @@ const struct Trainer gTrainers[] = {
         .trainerName = _("BRAWLY"),
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
-        .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
+        .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SMART_SWITCHING | AI_FLAG_ACE_POKEMON,
         .party = ITEM_CUSTOM_MOVES(sParty_Brawly1),
     },
 
diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json
index 564a919f8..5bac75a5a 100755
--- a/src/data/wild_encounters.json
+++ b/src/data/wild_encounters.json
@@ -11912,7 +11912,7 @@
           "map": "MAP_GRANITE_CAVE_B3F",
           "base_label": "gGraniteCave_B3F0",
           "land_mons": {
-            "encounter_rate": 20,
+            "encounter_rate": 10,
             "mons": [
               {
                 "min_level": 10,