3 files changed, 19 insertions, 17 deletions
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index bdc600f55..e2693393a 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -6,15 +6,17 @@
   "region_map_section": "MAPSEC_ROCKET_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 7,
-  "elevator_flag": -2,
-  "battle_scene": "BATTLE_SCENE_3",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "floor_number": -2,
+  "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2",
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M",
+      "graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
       "x": 20,
       "y": 6,
       "elevation": 3,
@@ -23,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RocketHideout_B2F_EventScript_1612A2",
+      "script": "RocketHideout_B2F_EventScript_Grunt",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 15,
       "y": 3,
       "elevation": 3,
@@ -40,7 +42,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 2,
       "y": 5,
       "elevation": 3,
@@ -53,7 +55,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 5,
       "y": 7,
       "elevation": 3,
@@ -66,7 +68,7 @@
       "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL",
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
       "x": 0,
       "y": 14,
       "elevation": 3,
diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc
index 07916ad03..55e7f6a2a 100644
--- a/data/maps/RocketHideout_B2F/scripts.inc
+++ b/data/maps/RocketHideout_B2F/scripts.inc
@@ -1,7 +1,7 @@
 RocketHideout_B2F_MapScripts:: @ 81612A1
 	.byte 0
 
-RocketHideout_B2F_EventScript_1612A2:: @ 81612A2
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF
-	msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE
+RocketHideout_B2F_EventScript_Grunt:: @ 81612A2
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat
+	msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc
index d21c21555..a27121152 100644
--- a/data/maps/RocketHideout_B2F/text.inc
+++ b/data/maps/RocketHideout_B2F/text.inc
@@ -1,11 +1,11 @@
-Text_17508C:: @ 817508C
+RocketHideout_B2F_Text_GruntIntro:: @ 817508C
     .string "BOSS said you can see ghosts with\n"
     .string "the SILPH SCOPE.$"
 
-Text_1750BF:: @ 81750BF
+RocketHideout_B2F_Text_GruntDefeat:: @ 81750BF
     .string "I surrender!$"
 
-gUnknown_81750CC:: @ 81750CC
+RocketHideout_B2F_Text_GruntPostBattle:: @ 81750CC
     .string "The TEAM ROCKET HQ has four\n"
     .string "underground floors.\p"
     .string "Think you can reach the BOSS?$"