diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc
index 326a07206d..37bbfdb5d2 100644
--- a/asm/macros/scrcmd.inc
+++ b/asm/macros/scrcmd.inc
@@ -1985,8 +1985,8 @@
     .short SCRCMD_ENDCOMMUNICATION
     .endm
 
-    .macro ScrCmd_151
-    .short SCRCMD_151
+    .macro FieldCommEnterBattleRoom
+    .short SCRCMD_FIELDCOMMENTERBATTLEROOM
     .endm
 
     .macro SetCommPlayerDir dir
diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt
index 2cb01a14cc..e08cac538c 100644
--- a/generated/vars_flags.txt
+++ b/generated/vars_flags.txt
@@ -117,7 +117,7 @@ FLAG_UNK_0x0073
 FLAG_OBTAINED_GARDENIA_TM86
 FLAG_OBTAINED_ROARK_TM76
 FLAG_RECEIVED_ETERNA_CITY_CONDOMINIUMS_4F_TM04
-FLAG_UNK_0x0077
+FLAG_USED_ROTOM_APPLIANCE
 FLAG_TALKED_TO_PASTORIA_CITY_MIDDLE_HOUSE_BUG_CATCHER
 FLAG_EXPLORER_KIT_RECEIVED
 FLAG_ROARK_RETURNED_TO_OREBURGH_GYM
@@ -387,7 +387,7 @@ FLAG_HIDE_JUBILIFE_CITY_LOOKER
 FLAG_HIDE_MT_CORONET_2F_CAVE_PAINTING_SHARDS
 FLAG_HIDE_POKECENTER_DAILY_TRAINER_1
 FLAG_HIDE_POKECENTER_DAILY_TRAINER_2
-FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN
+FLAG_HIDE_VEILSTONE_STORE_B1F_PROF_ROWAN
 FLAG_HIDE_CANALAVE_LIBRARY_1F_LUCIAN
 FLAG_UNK_0x0187
 FLAG_HIDE_ROUTE_202_COUNTERPART
@@ -697,12 +697,12 @@ FLAG_HIDE_VILLA_VOLKNER
 FLAG_HIDE_VILLA_CYNTHIA
 FLAG_HIDE_VILLA_FLINT
 FLAG_HIDE_SPEAR_PILLAR_DISTORTED_MESPRIT
-FLAG_ROTOM_ROOM_HIDE_MICROWAVE_OVEN
-FLAG_ROTOM_ROOM_HIDE_WASHING_MACHINE
-FLAG_ROTOM_ROOM_HIDE_REFRIGERATOR
-FLAG_ROTOM_ROOM_HIDE_ROTARY_FAN
-FLAG_ROTOM_ROOM_HIDE_LAWN_MOWER
-FLAG_UNK_0x02C0
+FLAG_HIDE_ROTOMS_ROOM_MICROWAVE
+FLAG_HIDE_ROTOMS_ROOM_WASHING_MACHINE
+FLAG_HIDE_ROTOMS_ROOM_REFRIGERATOR
+FLAG_HIDE_ROTOMS_ROOM_FAN
+FLAG_HIDE_ROTOMS_ROOM_LAWN_MOWER
+FLAG_HIDE_ROTOMS_ROOM_PROF_ROWAN
 FLAG_HIDE_BATTLE_HALL_REPORTER
 FLAG_HIDE_ROUTE_214_GATE_TO_VEILSTONE_CITY_REPORTER
 FLAG_HIDE_BATTLE_FRONTIER_REPORTER
@@ -4382,7 +4382,7 @@ VAR_POKEMON_NEWS_PRESS_POKE_BALL_REWARD
 VAR_HALL_OF_ORIGIN_STATE
 VAR_ROUTE_227_BUCK_STATE
 VAR_VEILSTONE_CITY_COUNTERPART_NEEDS_HELP_STATE
-VAR_UNK_0x411B
+VAR_ROTOMS_ROOM_STATE
 VAR_UNK_0x411C
 VAR_TEAM_GALACTIC_ETERNA_BUILDING_1F_STATE
 VAR_VALLEY_WINDWORKS_LOOKER_STATE
diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h
index 9c3b1b4fad..16b2e8789f 100644
--- a/include/data/scripts/scrcmd.h
+++ b/include/data/scripts/scrcmd.h
@@ -342,7 +342,7 @@ ScriptCommand(SCRCMD_GETPLAYERGENDER,                                      ScrCm
 ScriptCommand(SCRCMD_HEALPARTY,                                            ScrCmd_HealParty)
 ScriptCommand(SCRCMD_DUMMY14F,                                             ScrCmd_Dummy14F)
 ScriptCommand(SCRCMD_ENDCOMMUNICATION,                                     ScrCmd_EndCommunication)
-ScriptCommand(SCRCMD_151,                                                  ScrCmd_151)
+ScriptCommand(SCRCMD_FIELDCOMMENTERBATTLEROOM,                             ScrCmd_FieldCommEnterBattleRoom)
 ScriptCommand(SCRCMD_SETCOMMPLAYERDIR,                                     ScrCmd_SetCommPlayerDir)
 ScriptCommand(SCRCMD_153,                                                  ScrCmd_153)
 ScriptCommand(SCRCMD_LOADTRAINERAPPEARANCES,                               ScrCmd_LoadTrainerAppearances)
diff --git a/res/field/events/events_communication_club_colosseum_2p.json b/res/field/events/events_communication_club_colosseum_2p.json
index 24a57c29a0..4cc53b8729 100644
--- a/res/field/events/events_communication_club_colosseum_2p.json
+++ b/res/field/events/events_communication_club_colosseum_2p.json
@@ -2,7 +2,7 @@
     "bg_events": [],
     "object_events": [
         {
-            "id": "COMMUNICATION_CLUB_COLOSSEUM_2P_WAITRESS_0",
+            "id": "LOCALID_WAITRESS",
             "graphics_id": "OBJ_EVENT_GFX_WAITRESS",
             "movement_type": "MOVEMENT_TYPE_LOOK_WEST",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_communication_club_colosseum_4p.json b/res/field/events/events_communication_club_colosseum_4p.json
index 972ec372d1..a1006c4762 100644
--- a/res/field/events/events_communication_club_colosseum_4p.json
+++ b/res/field/events/events_communication_club_colosseum_4p.json
@@ -2,7 +2,7 @@
     "bg_events": [],
     "object_events": [
         {
-            "id": "COMMUNICATION_CLUB_COLOSSEUM_4P_WAITRESS_0",
+            "id": "LOCALID_WAITRESS",
             "graphics_id": "OBJ_EVENT_GFX_WAITRESS",
             "movement_type": "MOVEMENT_TYPE_LOOK_WEST",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_footstep_house.json b/res/field/events/events_footstep_house.json
index e1c82968fa..987175a63e 100644
--- a/res/field/events/events_footstep_house.json
+++ b/res/field/events/events_footstep_house.json
@@ -2,7 +2,7 @@
     "bg_events": [],
     "object_events": [
         {
-            "id": "FOOTSTEP_HOUSE_COLLECTOR_0",
+            "id": "LOCALID_DR_FOOTSTEP",
             "graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_mining_museum.json b/res/field/events/events_mining_museum.json
index 0901902f18..76f0da1580 100644
--- a/res/field/events/events_mining_museum.json
+++ b/res/field/events/events_mining_museum.json
@@ -259,7 +259,7 @@
     ],
     "object_events": [
         {
-            "id": "MINING_MUSEUM_HIKER_0",
+            "id": "LOCALID_HIKER",
             "graphics_id": "OBJ_EVENT_GFX_HIKER",
             "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -274,7 +274,7 @@
             "y": 0
         },
         {
-            "id": "MINING_MUSEUM_TWIN_1",
+            "id": "LOCALID_TWIN",
             "graphics_id": "OBJ_EVENT_GFX_TWIN",
             "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -289,7 +289,7 @@
             "y": 0
         },
         {
-            "id": "MINING_MUSEUM_SCHOOL_KID_M_2",
+            "id": "LOCALID_SCHOOL_KID_M",
             "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -304,7 +304,7 @@
             "y": 0
         },
         {
-            "id": "MINING_MUSEUM_SCIENTIST_M_3",
+            "id": "LOCALID_SCIENTIST_M",
             "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -319,7 +319,7 @@
             "y": 0
         },
         {
-            "id": "MINING_MUSEUM_ACE_TRAINER_F_4",
+            "id": "LOCALID_ACE_TRAINER_F",
             "graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -334,7 +334,7 @@
             "y": 0
         },
         {
-            "id": "MINING_MUSEUM_POKEMON_BREEDER_F_5",
+            "id": "LOCALID_POKEMON_BREEDER_F",
             "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F",
             "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -349,7 +349,7 @@
             "y": 0
         },
         {
-            "id": "MINING_MUSEUM_COLLECTOR_6",
+            "id": "LOCALID_COLLECTOR",
             "graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
             "movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -364,7 +364,7 @@
             "y": 0
         },
         {
-            "id": "MINING_MUSEUM_EXPERT_M_7",
+            "id": "LOCALID_EXPERT_M",
             "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
             "movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_oreburgh_city_mart.json b/res/field/events/events_oreburgh_city_mart.json
index a5f1ad7b2e..c7ec8d32f2 100644
--- a/res/field/events/events_oreburgh_city_mart.json
+++ b/res/field/events/events_oreburgh_city_mart.json
@@ -2,7 +2,7 @@
     "bg_events": [],
     "object_events": [
         {
-            "id": "OREBURGH_CITY_MART_HIKER_0",
+            "id": "LOCALID_HIKER",
             "graphics_id": "OBJ_EVENT_GFX_HIKER",
             "movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
             "y": 0
         },
         {
-            "id": "OREBURGH_CITY_MART_COLLECTOR_1",
+            "id": "LOCALID_COLLECTOR",
             "graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
             "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_WEST",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
             "y": 0
         },
         {
-            "id": "OREBURGH_CITY_MART_CASHIER_F_2",
+            "id": "LOCALID_CASHIER_F",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
             "y": 0
         },
         {
-            "id": "OREBURGH_CITY_MART_CASHIER_M_3",
+            "id": "LOCALID_CASHIER_M",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_M",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
             "y": 0
         },
         {
-            "id": "OREBURGH_CITY_MART_MYSTERY_GIFT_DELIVERYMAN_4",
+            "id": "LOCALID_MYSTERY_GIFT_DELIVERYMAN",
             "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_rotoms_room.json b/res/field/events/events_rotoms_room.json
index b1f0aabf18..4670088206 100644
--- a/res/field/events/events_rotoms_room.json
+++ b/res/field/events/events_rotoms_room.json
@@ -43,11 +43,11 @@
     ],
     "object_events": [
         {
-            "id": "ROTOMS_ROOM_ROTOM_HEAT_0",
+            "id": "LOCALID_MICROWAVE",
             "graphics_id": "OBJ_EVENT_GFX_ROTOM_HEAT",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
-            "hidden_flag": "FLAG_ROTOM_ROOM_HIDE_MICROWAVE_OVEN",
+            "hidden_flag": "FLAG_HIDE_ROTOMS_ROOM_MICROWAVE",
             "script": 1,
             "initial_dir": 1,
             "data": [],
@@ -58,11 +58,11 @@
             "y": 0
         },
         {
-            "id": "ROTOMS_ROOM_ROTOM_FAN_1",
+            "id": "LOCALID_FAN",
             "graphics_id": "OBJ_EVENT_GFX_ROTOM_FAN",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
-            "hidden_flag": "FLAG_ROTOM_ROOM_HIDE_ROTARY_FAN",
+            "hidden_flag": "FLAG_HIDE_ROTOMS_ROOM_FAN",
             "script": 4,
             "initial_dir": 1,
             "data": [],
@@ -73,11 +73,11 @@
             "y": 0
         },
         {
-            "id": "ROTOMS_ROOM_ROTOM_FROST_2",
+            "id": "LOCALID_REFRIGERATOR",
             "graphics_id": "OBJ_EVENT_GFX_ROTOM_FROST",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
-            "hidden_flag": "FLAG_ROTOM_ROOM_HIDE_REFRIGERATOR",
+            "hidden_flag": "FLAG_HIDE_ROTOMS_ROOM_REFRIGERATOR",
             "script": 2,
             "initial_dir": 1,
             "data": [],
@@ -88,11 +88,11 @@
             "y": 0
         },
         {
-            "id": "ROTOMS_ROOM_ROTOM_WASH_3",
+            "id": "LOCALID_WASHING_MACHINE",
             "graphics_id": "OBJ_EVENT_GFX_ROTOM_WASH",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
-            "hidden_flag": "FLAG_ROTOM_ROOM_HIDE_WASHING_MACHINE",
+            "hidden_flag": "FLAG_HIDE_ROTOMS_ROOM_WASHING_MACHINE",
             "script": 3,
             "initial_dir": 1,
             "data": [],
@@ -103,11 +103,11 @@
             "y": 0
         },
         {
-            "id": "ROTOMS_ROOM_ROTOM_MOW_4",
+            "id": "LOCALID_LAWN_MOWER",
             "graphics_id": "OBJ_EVENT_GFX_ROTOM_MOW",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
-            "hidden_flag": "FLAG_ROTOM_ROOM_HIDE_LAWN_MOWER",
+            "hidden_flag": "FLAG_HIDE_ROTOMS_ROOM_LAWN_MOWER",
             "script": 5,
             "initial_dir": 1,
             "data": [],
@@ -118,7 +118,7 @@
             "y": 0
         },
         {
-            "id": "ROTOMS_ROOM_BOOK_5",
+            "id": "LOCALID_BOOK_MYSTERIOUS",
             "graphics_id": "OBJ_EVENT_GFX_BOOK",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -133,11 +133,11 @@
             "y": 0
         },
         {
-            "id": "ROTOMS_ROOM_PROF_ROWAN_6",
+            "id": "LOCALID_PROF_ROWAN",
             "graphics_id": "OBJ_EVENT_GFX_PROF_ROWAN",
             "movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
             "trainer_type": "TRAINER_TYPE_NONE",
-            "hidden_flag": "FLAG_UNK_0x02C0",
+            "hidden_flag": "FLAG_HIDE_ROTOMS_ROOM_PROF_ROWAN",
             "script": 0,
             "initial_dir": 0,
             "data": [],
@@ -148,7 +148,7 @@
             "y": 0
         },
         {
-            "id": "ROTOMS_ROOM_BOOK_7",
+            "id": "LOCALID_BOOK_OLD",
             "graphics_id": "OBJ_EVENT_GFX_BOOK",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_solaceon_ruins_room_3.json b/res/field/events/events_solaceon_ruins_room_3.json
index bf062909e5..b0f091cb0b 100644
--- a/res/field/events/events_solaceon_ruins_room_3.json
+++ b/res/field/events/events_solaceon_ruins_room_3.json
@@ -2,7 +2,7 @@
     "bg_events": [],
     "object_events": [
         {
-            "id": "SOLACEON_RUINS_ROOM_3_RUIN_MANIAC_KARL",
+            "id": "LOCALID_RUIN_MANIAC_KARL",
             "graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC",
             "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
             "trainer_type": "TRAINER_TYPE_NORMAL",
diff --git a/res/field/events/events_sunyshore_city_unknown_house_1.json b/res/field/events/events_sunyshore_city_unknown_house_1.json
index 591da88bc1..0c351ef3e8 100644
--- a/res/field/events/events_sunyshore_city_unknown_house_1.json
+++ b/res/field/events/events_sunyshore_city_unknown_house_1.json
@@ -2,7 +2,7 @@
     "bg_events": [],
     "object_events": [
         {
-            "id": "SUNYSHORE_CITY_UNKNOWN_HOUSE_1_OLD_MAN_0",
+            "id": "LOCALID_OLD_MAN",
             "graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
             "y": 0
         },
         {
-            "id": "SUNYSHORE_CITY_UNKNOWN_HOUSE_1_BUG_CATCHER_1",
+            "id": "LOCALID_BUG_CATCHER",
             "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_sunyshore_city_unknown_house_2.json b/res/field/events/events_sunyshore_city_unknown_house_2.json
index 1891c08429..43a710e5bb 100644
--- a/res/field/events/events_sunyshore_city_unknown_house_2.json
+++ b/res/field/events/events_sunyshore_city_unknown_house_2.json
@@ -2,7 +2,7 @@
     "bg_events": [],
     "object_events": [
         {
-            "id": "SUNYSHORE_CITY_UNKNOWN_HOUSE_2_SAILOR_0",
+            "id": "LOCALID_SAILOR",
             "graphics_id": "OBJ_EVENT_GFX_SAILOR",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
             "y": 0
         },
         {
-            "id": "SUNYSHORE_CITY_UNKNOWN_HOUSE_2_LASS_1",
+            "id": "LOCALID_LASS",
             "graphics_id": "OBJ_EVENT_GFX_LASS",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_veilstone_store_1f.json b/res/field/events/events_veilstone_store_1f.json
index e5abb48f23..7d1ba0bd0a 100644
--- a/res/field/events/events_veilstone_store_1f.json
+++ b/res/field/events/events_veilstone_store_1f.json
@@ -19,7 +19,7 @@
     ],
     "object_events": [
         {
-            "id": "VEILSTONE_STORE_1F_RECEPTIONIST_0",
+            "id": "LOCALID_RECEPTIONIST",
             "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -34,7 +34,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_1F_MIDDLE_AGED_MAN_1",
+            "id": "LOCALID_MIDDLE_AGED_MAN",
             "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -49,7 +49,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_1F_LADY_2",
+            "id": "LOCALID_LADY",
             "graphics_id": "OBJ_EVENT_GFX_LADY",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -64,7 +64,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_1F_SOCIALITE_3",
+            "id": "LOCALID_SOCIALITE",
             "graphics_id": "OBJ_EVENT_GFX_SOCIALITE",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -79,7 +79,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_1F_CASHIER_F_4",
+            "id": "LOCALID_CASHIER_F",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -94,7 +94,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_1F_CASHIER_M_5",
+            "id": "LOCALID_CASHIER_M",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_M",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_veilstone_store_2f.json b/res/field/events/events_veilstone_store_2f.json
index 6f63d6a236..53f875d91e 100644
--- a/res/field/events/events_veilstone_store_2f.json
+++ b/res/field/events/events_veilstone_store_2f.json
@@ -11,7 +11,7 @@
     ],
     "object_events": [
         {
-            "id": "VEILSTONE_STORE_2F_LADY_0",
+            "id": "LOCALID_LADY",
             "graphics_id": "OBJ_EVENT_GFX_LADY",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -26,7 +26,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_2F_BUG_CATCHER_1",
+            "id": "LOCALID_BUG_CATCHER_1",
             "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -41,7 +41,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_2F_CASHIER_M_2",
+            "id": "LOCALID_CASHIER_M",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_M",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -56,7 +56,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_2F_RECEPTIONIST_3",
+            "id": "LOCALID_RECEPTIONIST",
             "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -71,7 +71,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_2F_CASHIER_F_4",
+            "id": "LOCALID_CASHIER_F_UP",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -86,7 +86,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_2F_CASHIER_F_5",
+            "id": "LOCALID_CASHIER_F_MID",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -101,7 +101,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_2F_BUG_CATCHER_6",
+            "id": "LOCALID_BUG_CATCHER_2",
             "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_veilstone_store_3f.json b/res/field/events/events_veilstone_store_3f.json
index abcd565634..24f0c907c5 100644
--- a/res/field/events/events_veilstone_store_3f.json
+++ b/res/field/events/events_veilstone_store_3f.json
@@ -11,7 +11,7 @@
     ],
     "object_events": [
         {
-            "id": "VEILSTONE_STORE_3F_RECEPTIONIST_0",
+            "id": "LOCALID_RECEPTIONIST",
             "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -26,7 +26,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_3F_TWIN_1",
+            "id": "LOCALID_TWIN",
             "graphics_id": "OBJ_EVENT_GFX_TWIN",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -41,7 +41,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_3F_GUITARIST_2",
+            "id": "LOCALID_GUITARIST",
             "graphics_id": "OBJ_EVENT_GFX_GUITARIST",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -56,7 +56,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_3F_CASHIER_F_3",
+            "id": "LOCALID_CASHIER_F",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -71,7 +71,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_3F_CASHIER_M_4",
+            "id": "LOCALID_CASHIER_M",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_M",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -86,7 +86,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_3F_POKEMON_BREEDER_F_5",
+            "id": "LOCALID_POKEMON_BREEDER_F",
             "graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_veilstone_store_4f.json b/res/field/events/events_veilstone_store_4f.json
index 40eb626257..89d9c874bc 100644
--- a/res/field/events/events_veilstone_store_4f.json
+++ b/res/field/events/events_veilstone_store_4f.json
@@ -11,7 +11,7 @@
     ],
     "object_events": [
         {
-            "id": "VEILSTONE_STORE_4F_NINJA_BOY_0",
+            "id": "LOCALID_NINJA_BOY",
             "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -26,7 +26,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_4F_POKEFAN_F_1",
+            "id": "LOCALID_POKEFAN_F",
             "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -41,7 +41,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_4F_RECEPTIONIST_2",
+            "id": "LOCALID_RECEPTIONIST",
             "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -56,7 +56,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_4F_CASHIER_F_3",
+            "id": "LOCALID_CASHIER_F",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -71,7 +71,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_4F_CASHIER_M_4",
+            "id": "LOCALID_CASHIER_M",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_M",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -86,7 +86,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_4F_SCHOOL_KID_M_5",
+            "id": "LOCALID_SCHOOL_KID_M",
             "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_veilstone_store_5f.json b/res/field/events/events_veilstone_store_5f.json
index 7379014bfd..885b34e231 100644
--- a/res/field/events/events_veilstone_store_5f.json
+++ b/res/field/events/events_veilstone_store_5f.json
@@ -27,7 +27,7 @@
     ],
     "object_events": [
         {
-            "id": "VEILSTONE_STORE_5F_BUG_CATCHER_0",
+            "id": "LOCALID_BUG_CATCHER",
             "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -42,7 +42,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_5F_MIDDLE_AGED_WOMAN_1",
+            "id": "LOCALID_MIDDLE_AGED_WOMAN",
             "graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_WOMAN",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -57,7 +57,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_5F_COLLECTOR_2",
+            "id": "LOCALID_COLLECTOR_1",
             "graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -72,7 +72,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_5F_COLLECTOR_3",
+            "id": "LOCALID_COLLECTOR_2",
             "graphics_id": "OBJ_EVENT_GFX_COLLECTOR",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/events/events_veilstone_store_b1f.json b/res/field/events/events_veilstone_store_b1f.json
index 30671a6b3d..43d4b1cfc0 100644
--- a/res/field/events/events_veilstone_store_b1f.json
+++ b/res/field/events/events_veilstone_store_b1f.json
@@ -11,7 +11,7 @@
     ],
     "object_events": [
         {
-            "id": "VEILSTONE_STORE_B1F_RECEPTIONIST_0",
+            "id": "LOCALID_RECEPTIONIST_1",
             "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -26,7 +26,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_CASHIER_F_1",
+            "id": "LOCALID_CASHIER_F_LAVA_COOKIE",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -41,7 +41,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_CASHIER_F_2",
+            "id": "LOCALID_CASHIER_F_POFFIN",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -56,7 +56,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_SOCIALITE_3",
+            "id": "LOCALID_SOCIALITE_1",
             "graphics_id": "OBJ_EVENT_GFX_SOCIALITE",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -71,7 +71,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_RECEPTIONIST_4",
+            "id": "LOCALID_RECEPTIONIST_2",
             "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -86,7 +86,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_CASHIER_F_5",
+            "id": "LOCALID_CASHIER_F_BERRY",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -101,7 +101,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_CASHIER_F_6",
+            "id": "LOCALID_CASHIER_F_RAGE_CANDY_BAR",
             "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -116,7 +116,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_SOCIALITE_7",
+            "id": "LOCALID_SOCIALITE_2",
             "graphics_id": "OBJ_EVENT_GFX_SOCIALITE",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -131,7 +131,7 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_GENTLEMAN_8",
+            "id": "LOCALID_GENTLEMAN",
             "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
             "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
             "trainer_type": "TRAINER_TYPE_NONE",
@@ -146,11 +146,11 @@
             "y": 0
         },
         {
-            "id": "VEILSTONE_STORE_B1F_PROF_ROWAN_9",
+            "id": "LOCALID_PROF_ROWAN",
             "graphics_id": "OBJ_EVENT_GFX_PROF_ROWAN",
             "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
             "trainer_type": "TRAINER_TYPE_NONE",
-            "hidden_flag": "FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN",
+            "hidden_flag": "FLAG_HIDE_VEILSTONE_STORE_B1F_PROF_ROWAN",
             "script": 7,
             "initial_dir": 1,
             "data": [],
diff --git a/res/field/events/events_veilstone_store_elevator.json b/res/field/events/events_veilstone_store_elevator.json
index a49d2d95c0..7d78c8aa63 100644
--- a/res/field/events/events_veilstone_store_elevator.json
+++ b/res/field/events/events_veilstone_store_elevator.json
@@ -2,7 +2,7 @@
     "bg_events": [],
     "object_events": [
         {
-            "id": "VEILSTONE_STORE_ELEVATOR_RECEPTIONIST_0",
+            "id": "LOCALID_RECEPTIONIST",
             "graphics_id": "OBJ_EVENT_GFX_RECEPTIONIST",
             "movement_type": "MOVEMENT_TYPE_NONE",
             "trainer_type": "TRAINER_TYPE_NONE",
diff --git a/res/field/scripts/scripts_communication_club_colosseum_2p.s b/res/field/scripts/scripts_communication_club_colosseum_2p.s
index bce75902ae..afc04bc71e 100644
--- a/res/field/scripts/scripts_communication_club_colosseum_2p.s
+++ b/res/field/scripts/scripts_communication_club_colosseum_2p.s
@@ -1,11 +1,11 @@
 #include "macros/scrcmd.inc"
 
 
-    ScriptEntry _0006
+    ScriptEntry CommunicationClubColosseum2P_OnTransition
     ScriptEntryEnd
 
-_0006:
-    ScrCmd_151
+CommunicationClubColosseum2P_OnTransition:
+    FieldCommEnterBattleRoom
     End
 
     .balign 4, 0
diff --git a/res/field/scripts/scripts_communication_club_colosseum_4p.s b/res/field/scripts/scripts_communication_club_colosseum_4p.s
index aeb2a374f7..8c18237512 100644
--- a/res/field/scripts/scripts_communication_club_colosseum_4p.s
+++ b/res/field/scripts/scripts_communication_club_colosseum_4p.s
@@ -1,12 +1,12 @@
 #include "macros/scrcmd.inc"
 
 
-    ScriptEntry _0006
+    ScriptEntry CommunicationClubColosseum4P_OnTransition
     ScriptEntryEnd
 
-_0006:
-    ScrCmd_151
+CommunicationClubColosseum4P_OnTransition:
+    FieldCommEnterBattleRoom
     End
 
-CommClubColosseum4P_Unused:
+CommunicationClubColosseum4P_Unused:
     End
diff --git a/res/field/scripts/scripts_footstep_house.s b/res/field/scripts/scripts_footstep_house.s
index 7f366674ca..54023ac38f 100644
--- a/res/field/scripts/scripts_footstep_house.s
+++ b/res/field/scripts/scripts_footstep_house.s
@@ -1,18 +1,19 @@
 #include "macros/scrcmd.inc"
 #include "res/text/bank/footstep_house.h"
+#include "res/field/events/events_footstep_house.h"
 #include "constants/footstep_house.h"
 #include "generated/ribbons.h"
 
-#define LOCALID_HAS_PRINT VAR_0x8000
-#define LOCALID_FOOTPRINT_TYPE VAR_0x8001
-#define LOCALID_PARTY_SLOT VAR_0x8002
+#define LOCAL_VAR_HAS_PRINT      VAR_0x8000
+#define LOCAL_VAR_FOOTPRINT_TYPE VAR_0x8001
+#define LOCAL_VAR_PARTY_SLOT     VAR_0x8002
 
 
-    ScriptEntry _000A
+    ScriptEntry FootstepHouse_OnTransition
     ScriptEntry FootstepHouse_DrFootstep
     ScriptEntryEnd
 
-_000A:
+FootstepHouse_OnTransition:
     SetFlag FLAG_FIRST_ARRIVAL_DOCTOR_FOOTSTEPS_HOUSE
     End
 
@@ -20,19 +21,19 @@ FootstepHouse_DrFootstep:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    GetFirstNonEggInParty LOCALID_PARTY_SLOT
-    BufferPartyMonSpecies 0, LOCALID_PARTY_SLOT
+    GetFirstNonEggInParty LOCAL_VAR_PARTY_SLOT
+    BufferPartyMonSpecies 0, LOCAL_VAR_PARTY_SLOT
     BufferPlayerName 1
-    BufferPartyMonNickname 2, LOCALID_PARTY_SLOT
-    GetPartyMonFootprintType LOCALID_HAS_PRINT, LOCALID_FOOTPRINT_TYPE, LOCALID_PARTY_SLOT
+    BufferPartyMonNickname 2, LOCAL_VAR_PARTY_SLOT
+    GetPartyMonFootprintType LOCAL_VAR_HAS_PRINT, LOCAL_VAR_FOOTPRINT_TYPE, LOCAL_VAR_PARTY_SLOT
     GoToIfSet FLAG_TALKED_TO_DR_FOOTSTEP, FootstepHouse_CheckFeelingsAgain
     SetFlag FLAG_TALKED_TO_DR_FOOTSTEP
-    Message FootstepHouse_Text_PokemonAreQuiteEasyForMeToRead
+    Message FootstepHouse_Text_PokemonEasyToRead
     CloseMessage
     GoTo FootstepHouse_FadeScreen
 
 FootstepHouse_CheckFeelingsAgain:
-    Message FootstepHouse_Text_DoYouWantToCheckTheFeelingsOfYourPokemonAgain
+    Message FootstepHouse_Text_CheckFeelingsAgain
     CloseMessage
     GoTo FootstepHouse_FadeScreen
 
@@ -42,356 +43,356 @@ FootstepHouse_FadeScreen:
     WaitTime 40, VAR_RESULT
     FadeScreenIn
     WaitFadeScreen
-    Call _008A
+    Call FootstepHouse_DrFootstepStepBack
     WaitTime 20, VAR_RESULT
     IncrementGameRecord RECORD_CHECKED_FOOTPRINTS
     GoTo FootstepHouse_CheckType
 
-_008A:
+FootstepHouse_DrFootstepStepBack:
     GetPlayerMapPos VAR_0x8005, VAR_0x8006
-    GoToIfEq VAR_0x8005, 4, _00BD
-    GoToIfEq VAR_0x8005, 6, _00C9
-    GoToIfEq VAR_0x8006, 5, _00D5
-    GoTo _00E1
+    GoToIfEq VAR_0x8005, 4, FootstepHouse_DrFootstepStepBackX4
+    GoToIfEq VAR_0x8005, 6, FootstepHouse_DrFootstepStepBackX6
+    GoToIfEq VAR_0x8006, 5, FootstepHouse_DrFootstepStepBackZ5
+    GoTo FootstepHouse_DrFootstepStepBackZ7
 
-_00BD:
-    ApplyMovement 0, _0698
+FootstepHouse_DrFootstepStepBackX4:
+    ApplyMovement LOCALID_DR_FOOTSTEP, FootstepHouse_Movement_DrFootstepStepBackEast
     WaitMovement
     Return
 
-_00C9:
-    ApplyMovement 0, _06A8
+FootstepHouse_DrFootstepStepBackX6:
+    ApplyMovement LOCALID_DR_FOOTSTEP, FootstepHouse_Movement_DrFootstepStepBackWest
     WaitMovement
     Return
 
-_00D5:
-    ApplyMovement 0, _06B8
+FootstepHouse_DrFootstepStepBackZ5:
+    ApplyMovement LOCALID_DR_FOOTSTEP, FootstepHouse_Movement_DrFootstepStepBackSouth
     WaitMovement
     Return
 
-_00E1:
-    ApplyMovement 0, _06C8
+FootstepHouse_DrFootstepStepBackZ7:
+    ApplyMovement LOCALID_DR_FOOTSTEP, FootstepHouse_Movement_DrFootstepStepBackNorth
     WaitMovement
     Return
 
-_00ED:
+FootstepHouse_DrFootstepWalkToPlayer:
     GetPlayerMapPos VAR_0x8005, VAR_0x8006
-    GoToIfEq VAR_0x8005, 4, _0120
-    GoToIfEq VAR_0x8005, 6, _012C
-    GoToIfEq VAR_0x8006, 5, _0138
-    GoTo _0144
+    GoToIfEq VAR_0x8005, 4, FootstepHouse_DrFootstepWalkToPlayerX4
+    GoToIfEq VAR_0x8005, 6, FootstepHouse_DrFootstepWalkToPlayerX6
+    GoToIfEq VAR_0x8006, 5, FootstepHouse_DrFootstepWalkToPlayerZ5
+    GoTo FootstepHouse_DrFootstepWalkToPlayerZ7
 
-_0120:
-    ApplyMovement 0, _06D8
+FootstepHouse_DrFootstepWalkToPlayerX4:
+    ApplyMovement LOCALID_DR_FOOTSTEP, FootstepHouse_Movement_DrFootstepWalkToPlayerX4
     WaitMovement
     Return
 
-_012C:
-    ApplyMovement 0, _06E0
+FootstepHouse_DrFootstepWalkToPlayerX6:
+    ApplyMovement LOCALID_DR_FOOTSTEP, FootstepHouse_Movement_DrFootstepWalkToPlayerX6
     WaitMovement
     Return
 
-_0138:
-    ApplyMovement 0, _06E8
+FootstepHouse_DrFootstepWalkToPlayerZ5:
+    ApplyMovement LOCALID_DR_FOOTSTEP, FootstepHouse_Movement_DrFootstepWalkToPlayerZ5
     WaitMovement
     Return
 
-_0144:
-    ApplyMovement 0, _06F0
+FootstepHouse_DrFootstepWalkToPlayerZ7:
+    ApplyMovement LOCALID_DR_FOOTSTEP, FootstepHouse_Movement_DrFootstepWalkToPlayerZ7
     WaitMovement
     Return
 
 FootstepHouse_CheckType:
-    GoToIfEq LOCALID_FOOTPRINT_TYPE, FOOTPRINT_TYPE_CUTE, FootstepHouse_CuteType
-    GoToIfEq LOCALID_FOOTPRINT_TYPE, FOOTPRINT_TYPE_TOUGH, FootstepHouse_ToughType
-    GoToIfEq LOCALID_FOOTPRINT_TYPE, FOOTPRINT_TYPE_SCARY, FootstepHouse_ScaryType
-    GoToIfEq LOCALID_FOOTPRINT_TYPE, FOOTPRINT_TYPE_SLOW, FootstepHouse_SlowType
+    GoToIfEq LOCAL_VAR_FOOTPRINT_TYPE, FOOTPRINT_TYPE_CUTE, FootstepHouse_CuteType
+    GoToIfEq LOCAL_VAR_FOOTPRINT_TYPE, FOOTPRINT_TYPE_TOUGH, FootstepHouse_ToughType
+    GoToIfEq LOCAL_VAR_FOOTPRINT_TYPE, FOOTPRINT_TYPE_SCARY, FootstepHouse_ScaryType
+    GoToIfEq LOCAL_VAR_FOOTPRINT_TYPE, FOOTPRINT_TYPE_SLOW, FootstepHouse_SlowType
     GoTo FootstepHouse_VoicelessType
 
 FootstepHouse_CuteType:
-    GoToIfEq LOCALID_HAS_PRINT, TRUE, FootstepHouse_CuteType_WithPrint
-    GoTo FootstepHouse_CuteType_WithoutPrint
+    GoToIfEq LOCAL_VAR_HAS_PRINT, TRUE, FootstepHouse_Cute_WithPrint
+    GoTo FootstepHouse_Cute_NoPrint
 
 FootstepHouse_ToughType:
-    GoToIfEq LOCALID_HAS_PRINT, TRUE, FootstepHouse_ToughType_WithPrint
-    GoTo FootstepHouse_ToughType_WithoutPrint
+    GoToIfEq LOCAL_VAR_HAS_PRINT, TRUE, FootstepHouse_Tough_WithPrint
+    GoTo FootstepHouse_Tough_NoPrint
 
 FootstepHouse_ScaryType:
-    GoToIfEq LOCALID_HAS_PRINT, TRUE, FootstepHouse_ScaryType_WithPrint
-    GoTo FootstepHouse_ScaryType_WithoutPrint
+    GoToIfEq LOCAL_VAR_HAS_PRINT, TRUE, FootstepHouse_Scary_WithPrint
+    GoTo FootstepHouse_Scary_NoPrint
 
 FootstepHouse_SlowType:
-    GoToIfEq LOCALID_HAS_PRINT, TRUE, FootstepHouse_SlowType_WithPrint
-    GoTo FootstepHouse_SlowType_WithoutPrint
+    GoToIfEq LOCAL_VAR_HAS_PRINT, TRUE, FootstepHouse_Slow_WithPrint
+    GoTo FootstepHouse_Slow_NoPrint
 
-FootstepHouse_CuteType_WithPrint:
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfGe VAR_RESULT, 0xFF, FootstepHouse_CuteType_WithPrint_Level5
-    GoToIfGe VAR_RESULT, 200, FootstepHouse_CuteType_WithPrint_Level4
-    GoToIfGe VAR_RESULT, 150, FootstepHouse_CuteType_WithPrint_Level3
-    GoToIfGe VAR_RESULT, 70, FootstepHouse_CuteType_WithPrint_Level2
-    GoTo FootstepHouse_CuteType_WithPrint_Level1
+FootstepHouse_Cute_WithPrint:
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfGe VAR_RESULT, 255, FootstepHouse_Cute_WithPrint_Level5
+    GoToIfGe VAR_RESULT, 200, FootstepHouse_Cute_WithPrint_Level4
+    GoToIfGe VAR_RESULT, 150, FootstepHouse_Cute_WithPrint_Level3
+    GoToIfGe VAR_RESULT, 70, FootstepHouse_Cute_WithPrint_Level2
+    GoTo FootstepHouse_Cute_WithPrint_Level1
 
-FootstepHouse_CuteType_WithoutPrint:
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfGe VAR_RESULT, 0xFF, FootstepHouse_CuteType_WithoutPrint_Level5
-    GoToIfGe VAR_RESULT, 200, FootstepHouse_CuteType_WithoutPrint_Level4
-    GoToIfGe VAR_RESULT, 150, FootstepHouse_CuteType_WithoutPrint_Level3
-    GoToIfGe VAR_RESULT, 70, FootstepHouse_CuteType_WithoutPrint_Level2
-    GoTo FootstepHouse_CuteType_WithoutPrint_Level1
+FootstepHouse_Cute_NoPrint:
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfGe VAR_RESULT, 255, FootstepHouse_Cute_NoPrint_Level5
+    GoToIfGe VAR_RESULT, 200, FootstepHouse_Cute_NoPrint_Level4
+    GoToIfGe VAR_RESULT, 150, FootstepHouse_Cute_NoPrint_Level3
+    GoToIfGe VAR_RESULT, 70, FootstepHouse_Cute_NoPrint_Level2
+    GoTo FootstepHouse_Cute_NoPrint_Level1
 
-FootstepHouse_ToughType_WithPrint:
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfGe VAR_RESULT, 0xFF, FootstepHouse_ToughType_WithPrint_Level5
-    GoToIfGe VAR_RESULT, 200, FootstepHouse_ToughType_WithPrint_Level4
-    GoToIfGe VAR_RESULT, 150, FootstepHouse_ToughType_WithPrint_Level3
-    GoToIfGe VAR_RESULT, 70, FootstepHouse_ToughType_WithPrint_Level2
-    GoTo FootstepHouse_ToughType_WithPrint_Level1
+FootstepHouse_Tough_WithPrint:
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfGe VAR_RESULT, 255, FootstepHouse_Tough_WithPrint_Level5
+    GoToIfGe VAR_RESULT, 200, FootstepHouse_Tough_WithPrint_Level4
+    GoToIfGe VAR_RESULT, 150, FootstepHouse_Tough_WithPrint_Level3
+    GoToIfGe VAR_RESULT, 70, FootstepHouse_Tough_WithPrint_Level2
+    GoTo FootstepHouse_Tough_WithPrint_Level1
 
-FootstepHouse_ToughType_WithoutPrint:
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfGe VAR_RESULT, 0xFF, FootstepHouse_ToughType_WithoutPrint_Level5
-    GoToIfGe VAR_RESULT, 200, FootstepHouse_ToughType_WithoutPrint_Level4
-    GoToIfGe VAR_RESULT, 150, FootstepHouse_ToughType_WithoutPrint_Level3
-    GoToIfGe VAR_RESULT, 70, FootstepHouse_ToughType_WithoutPrint_Level2
-    GoTo FootstepHouse_ToughType_WithoutPrint_Level1
+FootstepHouse_Tough_NoPrint:
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfGe VAR_RESULT, 255, FootstepHouse_Tough_NoPrint_Level5
+    GoToIfGe VAR_RESULT, 200, FootstepHouse_Tough_NoPrint_Level4
+    GoToIfGe VAR_RESULT, 150, FootstepHouse_Tough_NoPrint_Level3
+    GoToIfGe VAR_RESULT, 70, FootstepHouse_Tough_NoPrint_Level2
+    GoTo FootstepHouse_Tough_NoPrint_Level1
 
-FootstepHouse_ScaryType_WithPrint:
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfGe VAR_RESULT, 0xFF, FootstepHouse_ScaryType_WithPrint_Level5
-    GoToIfGe VAR_RESULT, 200, FootstepHouse_ScaryType_WithPrint_Level4
-    GoToIfGe VAR_RESULT, 150, FootstepHouse_ScaryType_WithPrint_Level3
-    GoToIfGe VAR_RESULT, 70, FootstepHouse_ScaryType_WithPrint_Level2
-    GoTo FootstepHouse_ScaryType_WithPrint_Level1
+FootstepHouse_Scary_WithPrint:
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfGe VAR_RESULT, 255, FootstepHouse_Scary_WithPrint_Level5
+    GoToIfGe VAR_RESULT, 200, FootstepHouse_Scary_WithPrint_Level4
+    GoToIfGe VAR_RESULT, 150, FootstepHouse_Scary_WithPrint_Level3
+    GoToIfGe VAR_RESULT, 70, FootstepHouse_Scary_WithPrint_Level2
+    GoTo FootstepHouse_Scary_WithPrint_Level1
 
-FootstepHouse_ScaryType_WithoutPrint:
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfGe VAR_RESULT, 0xFF, FootstepHouse_ScaryType_WithoutPrint_Level5
-    GoToIfGe VAR_RESULT, 200, FootstepHouse_ScaryType_WithoutPrint_Level4
-    GoToIfGe VAR_RESULT, 150, FootstepHouse_ScaryType_WithoutPrint_Level3
-    GoToIfGe VAR_RESULT, 70, FootstepHouse_ScaryType_WithoutPrint_Level2
-    GoTo FootstepHouse_ScaryType_WithoutPrint_Level1
+FootstepHouse_Scary_NoPrint:
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfGe VAR_RESULT, 255, FootstepHouse_Scary_NoPrint_Level5
+    GoToIfGe VAR_RESULT, 200, FootstepHouse_Scary_NoPrint_Level4
+    GoToIfGe VAR_RESULT, 150, FootstepHouse_Scary_NoPrint_Level3
+    GoToIfGe VAR_RESULT, 70, FootstepHouse_Scary_NoPrint_Level2
+    GoTo FootstepHouse_Scary_NoPrint_Level1
 
-FootstepHouse_SlowType_WithPrint:
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfGe VAR_RESULT, 0xFF, FootstepHouse_SlowType_WithPrint_Level5
-    GoToIfGe VAR_RESULT, 200, FootstepHouse_SlowType_WithPrint_Level4
-    GoToIfGe VAR_RESULT, 150, FootstepHouse_SlowType_WithPrint_Level3
-    GoToIfGe VAR_RESULT, 70, FootstepHouse_SlowType_WithPrint_Level2
-    GoTo FootstepHouse_SlowType_WithPrint_Level1
+FootstepHouse_Slow_WithPrint:
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfGe VAR_RESULT, 255, FootstepHouse_Slow_WithPrint_Level5
+    GoToIfGe VAR_RESULT, 200, FootstepHouse_Slow_WithPrint_Level4
+    GoToIfGe VAR_RESULT, 150, FootstepHouse_Slow_WithPrint_Level3
+    GoToIfGe VAR_RESULT, 70, FootstepHouse_Slow_WithPrint_Level2
+    GoTo FootstepHouse_Slow_WithPrint_Level1
 
-FootstepHouse_SlowType_WithoutPrint:
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfGe VAR_RESULT, 0xFF, FootstepHouse_SlowType_WithoutPrint_Level5
-    GoToIfGe VAR_RESULT, 200, FootstepHouse_SlowType_WithoutPrint_Level4
-    GoToIfGe VAR_RESULT, 150, FootstepHouse_SlowType_WithoutPrint_Level3
-    GoToIfGe VAR_RESULT, 70, FootstepHouse_SlowType_WithoutPrint_Level2
-    GoTo FootstepHouse_SlowType_WithoutPrint_Level1
+FootstepHouse_Slow_NoPrint:
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfGe VAR_RESULT, 255, FootstepHouse_Slow_NoPrint_Level5
+    GoToIfGe VAR_RESULT, 200, FootstepHouse_Slow_NoPrint_Level4
+    GoToIfGe VAR_RESULT, 150, FootstepHouse_Slow_NoPrint_Level3
+    GoToIfGe VAR_RESULT, 70, FootstepHouse_Slow_NoPrint_Level2
+    GoTo FootstepHouse_Slow_NoPrint_Level1
 
-FootstepHouse_CuteType_WithPrint_Level1:
-    Message FootstepHouse_Text_CuteType_WithPrint_Level1
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Cute_WithPrint_Level1:
+    Message FootstepHouse_Text_Cute_WithPrint_Level1
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_CuteType_WithPrint_Level2:
-    Message FootstepHouse_Text_CuteType_WithPrint_Level2
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Cute_WithPrint_Level2:
+    Message FootstepHouse_Text_Cute_WithPrint_Level2
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_CuteType_WithPrint_Level3:
-    Message FootstepHouse_Text_CuteType_WithPrint_Level3
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Cute_WithPrint_Level3:
+    Message FootstepHouse_Text_Cute_WithPrint_Level3
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_CuteType_WithPrint_Level4:
-    Message FootstepHouse_Text_CuteType_WithPrint_Level4
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Cute_WithPrint_Level4:
+    Message FootstepHouse_Text_Cute_WithPrint_Level4
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_CuteType_WithPrint_Level5:
-    Message FootstepHouse_Text_CuteType_WithPrint_Level5
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_TryGiveRibbon
+FootstepHouse_Cute_WithPrint_Level5:
+    Message FootstepHouse_Text_Cute_WithPrint_Level5
+    GoTo FootstepHouse_ThatsWhatPokemonThinks_TryGiveRibbon
 
-FootstepHouse_CuteType_WithoutPrint_Level1:
-    Message FootstepHouse_Text_CuteType_WithoutPrint_Level1
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Cute_NoPrint_Level1:
+    Message FootstepHouse_Text_Cute_NoPrint_Level1
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_CuteType_WithoutPrint_Level2:
-    Message FootstepHouse_Text_CuteType_WithoutPrint_Level2
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Cute_NoPrint_Level2:
+    Message FootstepHouse_Text_Cute_NoPrint_Level2
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_CuteType_WithoutPrint_Level3:
-    Message FootstepHouse_Text_CuteType_WithoutPrint_Level3
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Cute_NoPrint_Level3:
+    Message FootstepHouse_Text_Cute_NoPrint_Level3
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_CuteType_WithoutPrint_Level4:
-    Message FootstepHouse_Text_CuteType_WithoutPrint_Level4
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Cute_NoPrint_Level4:
+    Message FootstepHouse_Text_Cute_NoPrint_Level4
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_CuteType_WithoutPrint_Level5:
-    Message FootstepHouse_Text_CuteType_WithoutPrint_Level5
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints_TryGiveRibbon
+FootstepHouse_Cute_NoPrint_Level5:
+    Message FootstepHouse_Text_Cute_NoPrint_Level5
+    GoTo FootstepHouse_NoFootprints_TryGiveRibbon
 
-FootstepHouse_ToughType_WithPrint_Level1:
-    Message FootstepHouse_Text_ToughType_WithPrint_Level1
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Tough_WithPrint_Level1:
+    Message FootstepHouse_Text_Tough_WithPrint_Level1
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_ToughType_WithPrint_Level2:
-    Message FootstepHouse_Text_ToughType_WithPrint_Level2
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Tough_WithPrint_Level2:
+    Message FootstepHouse_Text_Tough_WithPrint_Level2
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_ToughType_WithPrint_Level3:
-    Message FootstepHouse_Text_ToughType_WithPrint_Level3
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Tough_WithPrint_Level3:
+    Message FootstepHouse_Text_Tough_WithPrint_Level3
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_ToughType_WithPrint_Level4:
-    Message FootstepHouse_Text_ToughType_WithPrint_Level4
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Tough_WithPrint_Level4:
+    Message FootstepHouse_Text_Tough_WithPrint_Level4
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_ToughType_WithPrint_Level5:
-    Message FootstepHouse_Text_ToughType_WithPrint_Level5
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_TryGiveRibbon
+FootstepHouse_Tough_WithPrint_Level5:
+    Message FootstepHouse_Text_Tough_WithPrint_Level5
+    GoTo FootstepHouse_ThatsWhatPokemonThinks_TryGiveRibbon
 
-FootstepHouse_ToughType_WithoutPrint_Level1:
-    Message FootstepHouse_Text_ToughType_WithoutPrint_Level1
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Tough_NoPrint_Level1:
+    Message FootstepHouse_Text_Tough_NoPrint_Level1
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_ToughType_WithoutPrint_Level2:
-    Message FootstepHouse_Text_ToughType_WithoutPrint_Level2
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Tough_NoPrint_Level2:
+    Message FootstepHouse_Text_Tough_NoPrint_Level2
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_ToughType_WithoutPrint_Level3:
-    Message FootstepHouse_Text_ToughType_WithoutPrint_Level3
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Tough_NoPrint_Level3:
+    Message FootstepHouse_Text_Tough_NoPrint_Level3
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_ToughType_WithoutPrint_Level4:
-    Message FootstepHouse_Text_ToughType_WithoutPrint_Level4
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Tough_NoPrint_Level4:
+    Message FootstepHouse_Text_Tough_NoPrint_Level4
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_ToughType_WithoutPrint_Level5:
-    Message FootstepHouse_Text_ToughType_WithoutPrint_Level5
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints_TryGiveRibbon
+FootstepHouse_Tough_NoPrint_Level5:
+    Message FootstepHouse_Text_Tough_NoPrint_Level5
+    GoTo FootstepHouse_NoFootprints_TryGiveRibbon
 
-FootstepHouse_ScaryType_WithPrint_Level1:
-    Message FootstepHouse_Text_ScaryType_WithPrint_Level1
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Scary_WithPrint_Level1:
+    Message FootstepHouse_Text_Scary_WithPrint_Level1
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_ScaryType_WithPrint_Level2:
-    Message FootstepHouse_Text_ScaryType_WithPrint_Level2
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Scary_WithPrint_Level2:
+    Message FootstepHouse_Text_Scary_WithPrint_Level2
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_ScaryType_WithPrint_Level3:
-    Message FootstepHouse_Text_ScaryType_WithPrint_Level3
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Scary_WithPrint_Level3:
+    Message FootstepHouse_Text_Scary_WithPrint_Level3
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_ScaryType_WithPrint_Level4:
-    Message FootstepHouse_Text_ScaryType_WithPrint_Level4
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Scary_WithPrint_Level4:
+    Message FootstepHouse_Text_Scary_WithPrint_Level4
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_ScaryType_WithPrint_Level5:
-    Message FootstepHouse_Text_ScaryType_WithPrint_Level5
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_TryGiveRibbon
+FootstepHouse_Scary_WithPrint_Level5:
+    Message FootstepHouse_Text_Scary_WithPrint_Level5
+    GoTo FootstepHouse_ThatsWhatPokemonThinks_TryGiveRibbon
 
-FootstepHouse_ScaryType_WithoutPrint_Level1:
-    Message FootstepHouse_Text_ScaryType_WithoutPrint_Level1
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Scary_NoPrint_Level1:
+    Message FootstepHouse_Text_Scary_NoPrint_Level1
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_ScaryType_WithoutPrint_Level2:
-    Message FootstepHouse_Text_ScaryType_WithoutPrint_Level2
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Scary_NoPrint_Level2:
+    Message FootstepHouse_Text_Scary_NoPrint_Level2
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_ScaryType_WithoutPrint_Level3:
-    Message FootstepHouse_Text_ScaryType_WithoutPrint_Level3
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Scary_NoPrint_Level3:
+    Message FootstepHouse_Text_Scary_NoPrint_Level3
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_ScaryType_WithoutPrint_Level4:
-    Message FootstepHouse_Text_ScaryType_WithoutPrint_Level4
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Scary_NoPrint_Level4:
+    Message FootstepHouse_Text_Scary_NoPrint_Level4
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_ScaryType_WithoutPrint_Level5:
-    Message FootstepHouse_Text_ScaryType_WithoutPrint_Level5
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints_TryGiveRibbon
+FootstepHouse_Scary_NoPrint_Level5:
+    Message FootstepHouse_Text_Scary_NoPrint_Level5
+    GoTo FootstepHouse_NoFootprints_TryGiveRibbon
 
-FootstepHouse_SlowType_WithPrint_Level1:
-    Message FootstepHouse_Text_SlowType_WithoutPrint_Level1
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Slow_WithPrint_Level1:
+    Message FootstepHouse_Text_Slow_NoPrint_Level1
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_SlowType_WithPrint_Level2:
-    Message FootstepHouse_Text_SlowType_WithoutPrint_Level2
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Slow_WithPrint_Level2:
+    Message FootstepHouse_Text_Slow_NoPrint_Level2
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_SlowType_WithPrint_Level3:
-    Message FootstepHouse_Text_SlowType_WithoutPrint_Level3
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Slow_WithPrint_Level3:
+    Message FootstepHouse_Text_Slow_NoPrint_Level3
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_SlowType_WithPrint_Level4:
-    Message FootstepHouse_Text_SlowType_WithoutPrint_Level4
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_Slow_WithPrint_Level4:
+    Message FootstepHouse_Text_Slow_NoPrint_Level4
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_SlowType_WithPrint_Level5:
-    Message FootstepHouse_Text_SlowType_WithoutPrint_Level5
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_TryGiveRibbon
+FootstepHouse_Slow_WithPrint_Level5:
+    Message FootstepHouse_Text_Slow_NoPrint_Level5
+    GoTo FootstepHouse_ThatsWhatPokemonThinks_TryGiveRibbon
 
-FootstepHouse_SlowType_WithoutPrint_Level1:
-    Message FootstepHouse_Text_SlowType_WithPrint_Level1
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Slow_NoPrint_Level1:
+    Message FootstepHouse_Text_Slow_WithPrint_Level1
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_SlowType_WithoutPrint_Level2:
-    Message FootstepHouse_Text_SlowType_WithPrint_Level2
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Slow_NoPrint_Level2:
+    Message FootstepHouse_Text_Slow_WithPrint_Level2
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_SlowType_WithoutPrint_Level3:
-    Message FootstepHouse_Text_SlowType_WithPrint_Level3
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Slow_NoPrint_Level3:
+    Message FootstepHouse_Text_Slow_WithPrint_Level3
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_SlowType_WithoutPrint_Level4:
-    Message FootstepHouse_Text_SlowType_WithPrint_Level4
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_Slow_NoPrint_Level4:
+    Message FootstepHouse_Text_Slow_WithPrint_Level4
+    GoTo FootstepHouse_NoFootprints
 
-FootstepHouse_SlowType_WithoutPrint_Level5:
-    Message FootstepHouse_Text_SlowType_WithPrint_Level5
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints_TryGiveRibbon
+FootstepHouse_Slow_NoPrint_Level5:
+    Message FootstepHouse_Text_Slow_WithPrint_Level5
+    GoTo FootstepHouse_NoFootprints_TryGiveRibbon
 
-FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_TryGiveRibbon:
-    GetPartyMonRibbon VAR_RESULT, LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
-    GoToIfEq VAR_RESULT, FALSE, FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_GiveRibbon
-    GoTo FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon
+FootstepHouse_ThatsWhatPokemonThinks_TryGiveRibbon:
+    GetPartyMonRibbon VAR_RESULT, LOCAL_VAR_PARTY_SLOT, RIBBON_FOOTPRINT
+    GoToIfEq VAR_RESULT, FALSE, FootstepHouse_ThatsWhatPokemonThinks_GiveRibbon
+    GoTo FootstepHouse_ThatsWhatPokemonThinks
 
-FootstepHouse_PokemonDoesntLeaveAnyFootprints_TryGiveRibbon:
-    GetPartyMonRibbon VAR_RESULT, LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
-    GoToIfEq VAR_RESULT, FALSE, FootstepHouse_PokemonDoesntLeaveAnyFootprints_GiveRibbon
-    GoTo FootstepHouse_PokemonDoesntLeaveAnyFootprints
+FootstepHouse_NoFootprints_TryGiveRibbon:
+    GetPartyMonRibbon VAR_RESULT, LOCAL_VAR_PARTY_SLOT, RIBBON_FOOTPRINT
+    GoToIfEq VAR_RESULT, FALSE, FootstepHouse_NoFootprints_GiveRibbon
+    GoTo FootstepHouse_NoFootprints
 
 FootstepHouse_VoicelessType:
     Message FootstepHouse_Text_SilentType
-    GetPartyMonFriendship VAR_RESULT, LOCALID_PARTY_SLOT
-    GoToIfLt VAR_RESULT, 0xFF, FootstepHouse_PokemonSilentType_NoRibbon
-    GetPartyMonRibbon VAR_RESULT, LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
+    GetPartyMonFriendship VAR_RESULT, LOCAL_VAR_PARTY_SLOT
+    GoToIfLt VAR_RESULT, 255, FootstepHouse_PokemonSilentType
+    GetPartyMonRibbon VAR_RESULT, LOCAL_VAR_PARTY_SLOT, RIBBON_FOOTPRINT
     GoToIfEq VAR_RESULT, FALSE, FootstepHouse_PokemonSilentType_GiveRibbon
-    GoTo FootstepHouse_PokemonSilentType_NoRibbon
+    GoTo FootstepHouse_PokemonSilentType
 
-FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon:
+FootstepHouse_ThatsWhatPokemonThinks:
     CloseMessage
     WaitTime 20, VAR_RESULT
-    Call _00ED
+    Call FootstepHouse_DrFootstepWalkToPlayer
     WaitTime 10, VAR_RESULT
-    Message FootstepHouse_Text_AndThatsWhatYourPokemonThinksOfYou
+    Message FootstepHouse_Text_ThatsWhatPokemonThinks
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-FootstepHouse_PokemonDoesntLeaveAnyFootprints:
+FootstepHouse_NoFootprints:
     CloseMessage
     WaitTime 20, VAR_RESULT
-    Call _00ED
+    Call FootstepHouse_DrFootstepWalkToPlayer
     WaitTime 10, VAR_RESULT
-    Message FootstepHouse_Text_PokemonDoesntLeaveAnyFootprints
+    Message FootstepHouse_Text_NoFootprints
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-FootstepHouse_PokemonSilentType_NoRibbon:
+FootstepHouse_PokemonSilentType:
     CloseMessage
     WaitTime 20, VAR_RESULT
-    Call _00ED
+    Call FootstepHouse_DrFootstepWalkToPlayer
     WaitTime 10, VAR_RESULT
     Message FootstepHouse_Text_PokemonSilentType
     WaitButton
@@ -399,33 +400,33 @@ FootstepHouse_PokemonSilentType_NoRibbon:
     ReleaseAll
     End
 
-FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_GiveRibbon:
+FootstepHouse_ThatsWhatPokemonThinks_GiveRibbon:
     CloseMessage
     WaitTime 20, VAR_RESULT
-    Call _00ED
+    Call FootstepHouse_DrFootstepWalkToPlayer
     WaitTime 10, VAR_RESULT
-    Message FootstepHouse_Text_AndThatsWhatYourPokemonThinksOfYou_CloseBond
+    Message FootstepHouse_Text_ThatsWhatPokemonThinks_CloseBond
     PlayFanfare SEQ_FANFA1
     Message FootstepHouse_Text_PlayerReceivedFootprintRibbon
     WaitFanfare
-    SetPartyMonRibbon LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
-    Message FootstepHouse_Text_PlayerPutTheFootprintRibbonOnPokemon
+    SetPartyMonRibbon LOCAL_VAR_PARTY_SLOT, RIBBON_FOOTPRINT
+    Message FootstepHouse_Text_PutRibbonOnPokemon
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-FootstepHouse_PokemonDoesntLeaveAnyFootprints_GiveRibbon:
+FootstepHouse_NoFootprints_GiveRibbon:
     CloseMessage
     WaitTime 20, VAR_RESULT
-    Call _00ED
+    Call FootstepHouse_DrFootstepWalkToPlayer
     WaitTime 10, VAR_RESULT
-    Message FootstepHouse_Text_PokemonDoesntLeaveAnyFootprints_CloseBond
+    Message FootstepHouse_Text_NoFootprints_CloseBond
     PlayFanfare SEQ_FANFA1
     Message FootstepHouse_Text_PlayerReceivedFootprintRibbon
     WaitFanfare
-    SetPartyMonRibbon LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
-    Message FootstepHouse_Text_PlayerPutTheFootprintRibbonOnPokemon
+    SetPartyMonRibbon LOCAL_VAR_PARTY_SLOT, RIBBON_FOOTPRINT
+    Message FootstepHouse_Text_PutRibbonOnPokemon
     WaitButton
     CloseMessage
     ReleaseAll
@@ -434,63 +435,63 @@ FootstepHouse_PokemonDoesntLeaveAnyFootprints_GiveRibbon:
 FootstepHouse_PokemonSilentType_GiveRibbon:
     CloseMessage
     WaitTime 20, VAR_RESULT
-    Call _00ED
+    Call FootstepHouse_DrFootstepWalkToPlayer
     WaitTime 10, VAR_RESULT
     Message FootstepHouse_Text_SilentType_CloseBond
     PlayFanfare SEQ_FANFA1
     Message FootstepHouse_Text_PlayerReceivedFootprintRibbon
     WaitFanfare
-    SetPartyMonRibbon LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
-    Message FootstepHouse_Text_PlayerPutTheFootprintRibbonOnPokemon
+    SetPartyMonRibbon LOCAL_VAR_PARTY_SLOT, RIBBON_FOOTPRINT
+    Message FootstepHouse_Text_PutRibbonOnPokemon
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
     .balign 4, 0
-_0698:
+FootstepHouse_Movement_DrFootstepStepBackEast:
     LockDir
     WalkNormalEast
     UnlockDir
     EndMovement
 
     .balign 4, 0
-_06A8:
+FootstepHouse_Movement_DrFootstepStepBackWest:
     LockDir
     WalkNormalWest
     UnlockDir
     EndMovement
 
     .balign 4, 0
-_06B8:
+FootstepHouse_Movement_DrFootstepStepBackSouth:
     LockDir
     WalkNormalSouth
     UnlockDir
     EndMovement
 
     .balign 4, 0
-_06C8:
+FootstepHouse_Movement_DrFootstepStepBackNorth:
     LockDir
     WalkNormalNorth
     UnlockDir
     EndMovement
 
     .balign 4, 0
-_06D8:
+FootstepHouse_Movement_DrFootstepWalkToPlayerX4:
     WalkNormalWest
     EndMovement
 
     .balign 4, 0
-_06E0:
+FootstepHouse_Movement_DrFootstepWalkToPlayerX6:
     WalkNormalEast
     EndMovement
 
     .balign 4, 0
-_06E8:
+FootstepHouse_Movement_DrFootstepWalkToPlayerZ5:
     WalkNormalNorth
     EndMovement
 
     .balign 4, 0
-_06F0:
+FootstepHouse_Movement_DrFootstepWalkToPlayerZ7:
     WalkNormalSouth
     EndMovement
diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s
index a8ebb789ae..cec58e11f6 100644
--- a/res/field/scripts/scripts_init_new_game.s
+++ b/res/field/scripts/scripts_init_new_game.s
@@ -58,7 +58,7 @@ _0006:
     SetFlag FLAG_HIDE_CYCLE_SHOP_POKEFAN_M
     SetFlag FLAG_ETERNA_CITY_SOUTH_HOUSE_HIDE_PROF_OAK
     SetFlag FLAG_HIDE_TEAM_GALACTIC_ETERNA_BUILDING_1F_LOOKER
-    SetFlag FLAG_UNK_0x02C0
+    SetFlag FLAG_HIDE_ROTOMS_ROOM_PROF_ROWAN
     SetFlag FLAG_HIDE_HEARTHOME_CITY_BUNEARY
     SetFlag FLAG_HIDE_HEARTHOME_CITY_KEIRA
     SetFlag FLAG_HIDE_HEARTHOME_ROUTE_209_GATE_RIVAL
@@ -74,7 +74,7 @@ _0006:
     SetFlag FLAG_HIDE_VEILSTONE_CRASHER_WAKE
     SetFlag FLAG_HIDE_VEILSTONE_CITY_LOOKER
     SetFlag FLAG_HIDE_VEILSTONE_CITY_GALACTIC_WAREHOUSE_LOOKER
-    SetFlag FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN
+    SetFlag FLAG_HIDE_VEILSTONE_STORE_B1F_PROF_ROWAN
     SetFlag FLAG_HIDE_ROUTE_207_COUNTERPART
     SetFlag FLAG_HIDE_POKEMON_LEAGUE_NORTH_POKECENTER_1F_RIVAL
     SetFlag FLAG_HIDE_FLOAROMA_MEADOW_WORKS_KEY
diff --git a/res/field/scripts/scripts_init_rotoms_room.s b/res/field/scripts/scripts_init_rotoms_room.s
index d821b331c6..5bb7072aea 100644
--- a/res/field/scripts/scripts_init_rotoms_room.s
+++ b/res/field/scripts/scripts_init_rotoms_room.s
@@ -7,7 +7,7 @@
     InitScriptEntryEnd
 
 InitScriptFrameTable:
-    InitScriptGoToIfEqual VAR_UNK_0x411B, 1, 11
+    InitScriptGoToIfEqual VAR_ROTOMS_ROOM_STATE, 1, 11
     InitScriptFrameTableEnd
 
     InitScriptEnd
diff --git a/res/field/scripts/scripts_mining_museum.s b/res/field/scripts/scripts_mining_museum.s
index a86ab5f38e..4d147941b0 100644
--- a/res/field/scripts/scripts_mining_museum.s
+++ b/res/field/scripts/scripts_mining_museum.s
@@ -1,27 +1,28 @@
 #include "macros/scrcmd.inc"
 #include "res/text/bank/mining_museum.h"
+#include "res/text/bank/menu_entries.h"
 
 
-    ScriptEntry MiningMuseum_Welcome
+    ScriptEntry MiningMuseum_AceTrainerF
     ScriptEntry MiningMuseum_FossilResearcher
-    ScriptEntry MiningMuseum_CoalExhibit1
-    ScriptEntry MiningMuseum_CoalExhibit2
-    ScriptEntry MiningMuseum_MineUnderSea
+    ScriptEntry MiningMuseum_Hiker
+    ScriptEntry MiningMuseum_Twin
+    ScriptEntry MiningMuseum_SchoolKidM
     ScriptEntry MiningMuseum_HowCoalIsMade1
     ScriptEntry MiningMuseum_HowCoalIsMade2
     ScriptEntry MiningMuseum_HowCoalIsMade3
-    ScriptEntry MiningMuseum_CoalSamplesDisplay
-    ScriptEntry MiningMuseum_CoalSamplesBox
-    ScriptEntry MiningMuseum_MiningLamps
-    ScriptEntry MiningMuseum_MiningTools
-    ScriptEntry MiningMuseum_MineWorkerItems
-    ScriptEntry MiningMuseum_UndergroundManInfo
-    ScriptEntry MiningMuseum_MiningRequiresStrongMind
-    ScriptEntry MiningMuseum_MineHistory
+    ScriptEntry MiningMuseum_DisplayCoalDifferentRegions
+    ScriptEntry MiningMuseum_DisplayCategorizedSamples
+    ScriptEntry MiningMuseum_DisplayLamps
+    ScriptEntry MiningMuseum_DisplayTools
+    ScriptEntry MiningMuseum_DisplayItems
+    ScriptEntry MiningMuseum_PokemonBreederF
+    ScriptEntry MiningMuseum_Collector
+    ScriptEntry MiningMuseum_ExpertM
     ScriptEntryEnd
 
-MiningMuseum_Welcome:
-    NPCMessage MiningMuseum_Text_Welcome
+MiningMuseum_AceTrainerF:
+    NPCMessage MiningMuseum_Text_WelcomeToMuseum
     End
 
 MiningMuseum_FossilResearcher:
@@ -34,7 +35,7 @@ MiningMuseum_FossilResearcher:
     GoToIfNe VAR_REVIVED_POKEMON_SPECIES, 0, MiningMuseum_PokemonRevival
     GetFossilCount VAR_0x8000
     GoToIfEq VAR_0x8000, 0, MiningMuseum_NoFossils
-    Message MiningMuseum_Text_HaveFossilForMe
+    Message MiningMuseum_Text_ShallIReviveFossil
     ShowYesNoMenu VAR_RESULT
     GoToIfEq VAR_RESULT, MENU_NO, MiningMuseum_DeclinedRevival
     GoToIfEq VAR_0x8000, 1, MiningMuseum_SingleFossilRevival
@@ -58,13 +59,13 @@ MiningMuseum_FossilResearcher:
     SetVar VAR_0x8005, 0
     InitGlobalTextMenu 1, 1, 0, VAR_0x8003
 MiningMuseum_FossilMenuLoop:
-    CallIfEq VAR_0x8005, 0, MiningMuseum_CheckFossil_OldAmber
-    CallIfEq VAR_0x8005, 1, MiningMuseum_CheckFossil_HelixFossil
-    CallIfEq VAR_0x8005, 2, MiningMuseum_CheckFossil_DomeFossil
-    CallIfEq VAR_0x8005, 3, MiningMuseum_CheckFossil_RootFossil
-    CallIfEq VAR_0x8005, 4, MiningMuseum_CheckFossil_ClawFossil
-    CallIfEq VAR_0x8005, 5, MiningMuseum_CheckFossil_ArmorFossil
-    CallIfEq VAR_0x8005, 6, MiningMuseum_CheckFossil_SkullFossil
+    CallIfEq VAR_0x8005, 0, MiningMuseum_CheckHasOldAmber
+    CallIfEq VAR_0x8005, 1, MiningMuseum_CheckHasHelixFossil
+    CallIfEq VAR_0x8005, 2, MiningMuseum_CheckHasDomeFossil
+    CallIfEq VAR_0x8005, 3, MiningMuseum_CheckHasRootFossil
+    CallIfEq VAR_0x8005, 4, MiningMuseum_CheckHasClawFossil
+    CallIfEq VAR_0x8005, 5, MiningMuseum_CheckHasArmorFossil
+    CallIfEq VAR_0x8005, 6, MiningMuseum_CheckHasSkullFossil
     GoToIfEq VAR_RESULT, FALSE, MiningMuseum_FossilMenuNext
     CallIfEq VAR_0x8004, 0, MiningMuseum_SetOldAmberVar
     CallIfEq VAR_0x8004, 1, MiningMuseum_SetHelixFossilVar
@@ -74,7 +75,7 @@ MiningMuseum_FossilMenuLoop:
     CallIfEq VAR_0x8004, 5, MiningMuseum_SetArmorFossilVar
     CallIfEq VAR_0x8004, 6, MiningMuseum_SetSkullFossilVar
     SetVar VAR_0x8006, VAR_0x8005
-    AddVar VAR_0x8006, 156
+    AddVar VAR_0x8006, MenuEntries_Text_Fossil_OldAmber
     AddMenuEntry VAR_0x8006, VAR_0x8004
     GoTo MiningMuseum_FossilMenuContinue
 
@@ -86,7 +87,7 @@ MiningMuseum_FossilMenuContinue:
     AddVar VAR_0x8004, 1
     AddVar VAR_0x8005, 1
     GoToIfNe VAR_0x8004, VAR_0x8001, MiningMuseum_FossilMenuLoop
-    AddMenuEntry 44, VAR_0x8004
+    AddMenuEntry MenuEntries_Text_Fossil_Cancel, VAR_0x8004
     ShowMenu
     GoToIfEq VAR_0x8003, 0xFF, MiningMuseum_DeclinedRevival
     GoToIfEq VAR_0x8003, VAR_MAP_LOCAL_0, MiningMuseum_DeclinedRevival
@@ -102,37 +103,37 @@ MiningMuseum_FossilMenuContinue:
     RemoveItem VAR_0x8002, 1, VAR_RESULT
     GoTo MiningMuseum_ExtractingPokemon
 
-MiningMuseum_CheckFossil_OldAmber:
+MiningMuseum_CheckHasOldAmber:
     SetVar VAR_MAP_LOCAL_0, ITEM_OLD_AMBER
     CheckItem VAR_MAP_LOCAL_0, 1, VAR_RESULT
     Return
 
-MiningMuseum_CheckFossil_HelixFossil:
+MiningMuseum_CheckHasHelixFossil:
     SetVar VAR_MAP_LOCAL_0, ITEM_HELIX_FOSSIL
     CheckItem VAR_MAP_LOCAL_0, 1, VAR_RESULT
     Return
 
-MiningMuseum_CheckFossil_DomeFossil:
+MiningMuseum_CheckHasDomeFossil:
     SetVar VAR_MAP_LOCAL_0, ITEM_DOME_FOSSIL
     CheckItem VAR_MAP_LOCAL_0, 1, VAR_RESULT
     Return
 
-MiningMuseum_CheckFossil_RootFossil:
+MiningMuseum_CheckHasRootFossil:
     SetVar VAR_MAP_LOCAL_0, ITEM_ROOT_FOSSIL
     CheckItem VAR_MAP_LOCAL_0, 1, VAR_RESULT
     Return
 
-MiningMuseum_CheckFossil_ClawFossil:
+MiningMuseum_CheckHasClawFossil:
     SetVar VAR_MAP_LOCAL_0, ITEM_CLAW_FOSSIL
     CheckItem VAR_MAP_LOCAL_0, 1, VAR_RESULT
     Return
 
-MiningMuseum_CheckFossil_ArmorFossil:
+MiningMuseum_CheckHasArmorFossil:
     SetVar VAR_MAP_LOCAL_0, ITEM_ARMOR_FOSSIL
     CheckItem VAR_MAP_LOCAL_0, 1, VAR_RESULT
     Return
 
-MiningMuseum_CheckFossil_SkullFossil:
+MiningMuseum_CheckHasSkullFossil:
     SetVar VAR_MAP_LOCAL_0, ITEM_SKULL_FOSSIL
     CheckItem VAR_MAP_LOCAL_0, 1, VAR_RESULT
     Return
@@ -216,13 +217,13 @@ MiningMuseum_DeclinedRevival:
 
 MiningMuseum_PokemonRevival:
     BufferSpeciesNameFromVar 0, VAR_REVIVED_POKEMON_SPECIES, 0, 0
-    Message MiningMuseum_Text_PokemonRevivedTooLong
+    Message MiningMuseum_Text_ThisIsRevivedPokemon
     GetPartyCount VAR_RESULT
-    GoToIfEq VAR_RESULT, 6, MiningMuseum_PartyFull
+    GoToIfEq VAR_RESULT, MAX_PARTY_SIZE, MiningMuseum_PartyFull
     BufferSpeciesNameFromVar 1, VAR_REVIVED_POKEMON_SPECIES, 0, 0
     BufferPlayerName 0
     PlayFanfare SEQ_FANFA4
-    Message MiningMuseum_Text_PokemonReceived
+    Message MiningMuseum_Text_ReceivedPokemon
     WaitFanfare
     GivePokemon VAR_REVIVED_POKEMON_SPECIES, 20, ITEM_NONE, VAR_RESULT
     IncrementGameRecord RECORD_POKEMON_RECEIVED_FROM_FOSSIL_REVIVAL
@@ -276,15 +277,15 @@ MiningMuseum_NotYetReady:
     ReleaseAll
     End
 
-MiningMuseum_CoalExhibit1:
+MiningMuseum_Hiker:
     NPCMessage MiningMuseum_Text_CoalExhibit1
     End
 
-MiningMuseum_CoalExhibit2:
+MiningMuseum_Twin:
     NPCMessage MiningMuseum_Text_CoalExhibit2
     End
 
-MiningMuseum_MineUnderSea:
+MiningMuseum_SchoolKidM:
     NPCMessage MiningMuseum_Text_MineExtendsUnderSea
     End
 
@@ -300,35 +301,35 @@ MiningMuseum_HowCoalIsMade3:
     EventMessage MiningMuseum_Text_HowCoalIsMade3
     End
 
-MiningMuseum_CoalSamplesDisplay:
-    EventMessage MiningMuseum_Text_CoalSamplesDisplay
+MiningMuseum_DisplayCoalDifferentRegions:
+    EventMessage MiningMuseum_Text_SamplesDifferentRegions
     End
 
-MiningMuseum_CoalSamplesBox:
-    EventMessage MiningMuseum_Text_CoalSamplesBox
+MiningMuseum_DisplayCategorizedSamples:
+    EventMessage MiningMuseum_Text_CategorizedCoalSamples
     End
 
-MiningMuseum_MiningLamps:
+MiningMuseum_DisplayLamps:
     EventMessage MiningMuseum_Text_MiningLamps
     End
 
-MiningMuseum_MiningTools:
+MiningMuseum_DisplayTools:
     EventMessage MiningMuseum_Text_MiningTools
     End
 
-MiningMuseum_MineWorkerItems:
+MiningMuseum_DisplayItems:
     EventMessage MiningMuseum_Text_MineWorkerItems
     End
 
-MiningMuseum_UndergroundManInfo:
+MiningMuseum_PokemonBreederF:
     NPCMessage MiningMuseum_Text_UndergroundManInfo
     End
 
-MiningMuseum_MiningRequiresStrongMind:
+MiningMuseum_Collector:
     NPCMessage MiningMuseum_Text_MiningRequiresStrongMind
     End
 
-MiningMuseum_MineHistory:
+MiningMuseum_ExpertM:
     NPCMessage MiningMuseum_Text_MineHistory
     End
 
diff --git a/res/field/scripts/scripts_pokemon_center_2f_attendants.s b/res/field/scripts/scripts_pokemon_center_2f_attendants.s
index 0870703006..fd82645794 100644
--- a/res/field/scripts/scripts_pokemon_center_2f_attendants.s
+++ b/res/field/scripts/scripts_pokemon_center_2f_attendants.s
@@ -350,7 +350,7 @@ _0513:
 
 _051E:
     StartLinkBattle
-    ScrCmd_151
+    FieldCommEnterBattleRoom
     End
 
     .balign 4, 0
diff --git a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s
index e1cc820a1c..6743a66a67 100644
--- a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s
+++ b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s
@@ -204,7 +204,7 @@ PokemonLeagueHallOfFame_ResetRoamingArticuno:
     Return
 
 PokemonLeagueHallOfFame_ShowVeilstoneStoreB1FProfRowan:
-    ClearFlag FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN
+    ClearFlag FLAG_HIDE_VEILSTONE_STORE_B1F_PROF_ROWAN
     Return
 
     .balign 4, 0
diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s
index 5349100f23..9167017be9 100644
--- a/res/field/scripts/scripts_rotoms_room.s
+++ b/res/field/scripts/scripts_rotoms_room.s
@@ -2,45 +2,46 @@
 #include "generated/distribution_events.h"
 #include "constants/moves.h"
 #include "res/text/bank/rotoms_room.h"
+#include "res/field/events/events_rotoms_room.h"
 
-#define LOCALID_PARTY_SLOT VAR_0x8000
-#define LOCALID_MOVE_TO_LEARN VAR_0x8001
-#define LOCALID_ROTOM_FORM VAR_0x8004
+#define LOCAL_VAR_PARTY_SLOT    VAR_0x8000
+#define LOCAL_VAR_MOVE_TO_LEARN VAR_0x8001
+#define LOCAL_VAR_ROTOM_FORM    VAR_0x8004
 
 
-    ScriptEntry RotomsRoom_MicrowaveOven
+    ScriptEntry RotomsRoom_Microwave
     ScriptEntry RotomsRoom_Refrigerator
     ScriptEntry RotomsRoom_WashingMachine
-    ScriptEntry RotomsRoom_RotaryFan
+    ScriptEntry RotomsRoom_Fan
     ScriptEntry RotomsRoom_LawnMower
     ScriptEntry RotomsRoom_MysteriousNotebook
-    ScriptEntry RotomsRoom_InitFlags
-    ScriptEntry _002E
-    ScriptEntry _07BB
+    ScriptEntry RotomsRoom_OnTransition
+    ScriptEntry RotomsRoom_OnResume
+    ScriptEntry RotomsRoom_ApplianceSpot
     ScriptEntry RotomsRoom_OldNotebook
-    ScriptEntry RotomsRoom_ProfessorRowan
+    ScriptEntry RotomsRoom_OnFrameProfRowan
     ScriptEntryEnd
 
-_002E:
+RotomsRoom_OnResume:
     End
 
-RotomsRoom_InitFlags:
-    SetFlag FLAG_ROTOM_ROOM_HIDE_MICROWAVE_OVEN
-    SetFlag FLAG_ROTOM_ROOM_HIDE_WASHING_MACHINE
-    SetFlag FLAG_ROTOM_ROOM_HIDE_REFRIGERATOR
-    SetFlag FLAG_ROTOM_ROOM_HIDE_ROTARY_FAN
-    SetFlag FLAG_ROTOM_ROOM_HIDE_LAWN_MOWER
+RotomsRoom_OnTransition:
+    SetFlag FLAG_HIDE_ROTOMS_ROOM_MICROWAVE
+    SetFlag FLAG_HIDE_ROTOMS_ROOM_WASHING_MACHINE
+    SetFlag FLAG_HIDE_ROTOMS_ROOM_REFRIGERATOR
+    SetFlag FLAG_HIDE_ROTOMS_ROOM_FAN
+    SetFlag FLAG_HIDE_ROTOMS_ROOM_LAWN_MOWER
     CheckDistributionEvent DISTRIBUTION_EVENT_ROTOM, VAR_MAP_LOCAL_0
-    GoToIfEq VAR_MAP_LOCAL_0, FALSE, _00A5
+    GoToIfEq VAR_MAP_LOCAL_0, FALSE, RotomsRoom_RemoveBgEvents
     GetRotomFormsInSave VAR_MAP_LOCAL_0, VAR_MAP_LOCAL_1, VAR_MAP_LOCAL_2, VAR_MAP_LOCAL_3, VAR_MAP_LOCAL_4
-    CallIfEq VAR_MAP_LOCAL_0, FALSE, RotomsRoom_InitShowMicrowaveOven
-    CallIfEq VAR_MAP_LOCAL_1, FALSE, RotomsRoom_InitShowWashingMachine
-    CallIfEq VAR_MAP_LOCAL_2, FALSE, RotomsRoom_InitShowRefrigerator
-    CallIfEq VAR_MAP_LOCAL_3, FALSE, RotomsRoom_InitShowRotaryFan
-    CallIfEq VAR_MAP_LOCAL_4, FALSE, RotomsRoom_InitShowLawnMower
+    CallIfEq VAR_MAP_LOCAL_0, FALSE, RotomsRoom_ShowMicrowave
+    CallIfEq VAR_MAP_LOCAL_1, FALSE, RotomsRoom_ShowWashingMachine
+    CallIfEq VAR_MAP_LOCAL_2, FALSE, RotomsRoom_ShowRefrigerator
+    CallIfEq VAR_MAP_LOCAL_3, FALSE, RotomsRoom_ShowFan
+    CallIfEq VAR_MAP_LOCAL_4, FALSE, RotomsRoom_ShowLawnMower
     End
 
-_00A5:
+RotomsRoom_RemoveBgEvents:
     SetBgEventPos 0, 4, 1
     SetBgEventPos 1, 4, 1
     SetBgEventPos 2, 4, 1
@@ -48,58 +49,58 @@ _00A5:
     SetBgEventPos 4, 4, 1
     End
 
-RotomsRoom_InitShowMicrowaveOven:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_MICROWAVE_OVEN
+RotomsRoom_ShowMicrowave:
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_MICROWAVE
     Return
 
-RotomsRoom_InitShowWashingMachine:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_WASHING_MACHINE
+RotomsRoom_ShowWashingMachine:
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_WASHING_MACHINE
     Return
 
-RotomsRoom_InitShowRefrigerator:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_REFRIGERATOR
+RotomsRoom_ShowRefrigerator:
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_REFRIGERATOR
     Return
 
-RotomsRoom_InitShowRotaryFan:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_ROTARY_FAN
+RotomsRoom_ShowFan:
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_FAN
     Return
 
-RotomsRoom_InitShowLawnMower:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_LAWN_MOWER
+RotomsRoom_ShowLawnMower:
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_LAWN_MOWER
     Return
 
-RotomsRoom_MicrowaveOven:
+RotomsRoom_Microwave:
     PlaySE SEQ_SE_CONFIRM
     LockAll
-    SetVar LOCALID_ROTOM_FORM, ROTOM_FORM_HEAT
+    SetVar LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_HEAT
     GoTo RotomsRoom_CheckAppliance
     End
 
 RotomsRoom_Refrigerator:
     PlaySE SEQ_SE_CONFIRM
     LockAll
-    SetVar LOCALID_ROTOM_FORM, ROTOM_FORM_FROST
+    SetVar LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FROST
     GoTo RotomsRoom_CheckAppliance
     End
 
 RotomsRoom_WashingMachine:
     PlaySE SEQ_SE_CONFIRM
     LockAll
-    SetVar LOCALID_ROTOM_FORM, ROTOM_FORM_WASH
+    SetVar LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_WASH
     GoTo RotomsRoom_CheckAppliance
     End
 
-RotomsRoom_RotaryFan:
+RotomsRoom_Fan:
     PlaySE SEQ_SE_CONFIRM
     LockAll
-    SetVar LOCALID_ROTOM_FORM, ROTOM_FORM_FAN
+    SetVar LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FAN
     GoTo RotomsRoom_CheckAppliance
     End
 
 RotomsRoom_LawnMower:
     PlaySE SEQ_SE_CONFIRM
     LockAll
-    SetVar LOCALID_ROTOM_FORM, ROTOM_FORM_MOW
+    SetVar LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_MOW
     GoTo RotomsRoom_CheckAppliance
     End
 
@@ -110,66 +111,66 @@ RotomsRoom_CheckAppliance:
     GoToIfEq VAR_RESULT, FALSE, RotomsRoom_ItsAnAppliance
     CheckDistributionEvent DISTRIBUTION_EVENT_ROTOM, VAR_RESULT
     GoToIfEq VAR_RESULT, FALSE, RotomsRoom_ItsAnAppliance
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_ItsAMicrowaveOvenRotomWantsToGoIntoTheMotor
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_ItsARefrigeratorRotomWantsToGoIntoTheMotor
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_ItsAWashingMachineRotomWantsToGoIntoTheMotor
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_ItsARotaryFanRotomWantsToGoIntoTheMotor
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_ItsALawnMowerRotomWantsToGoIntoTheMotor
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_AllowRotomEnterMicrowave
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_AllowRotomEnterRefrigerator
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_AllowRotomEnterWashingMachine
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_AllowRotomEnterFan
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_AllowRotomEnterLawnMower
     GetPartyRotomCountAndFirst VAR_0x8003, VAR_RESULT
-    GoToIfGe VAR_0x8003, 1, _0254
+    GoToIfGe VAR_0x8003, 1, RotomsRoom_EnterMotorMenu
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_RotomGaveUpEnteringTheMotor
-    GoTo _01F8
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_RotomGaveUpEnteringMotor
+    GoTo RotomsRoom_GetRotomForEnter
     End
 
-_01F8:
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_SetVarOverheat
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_SetVarBlizzard
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_SetVarHydroPump
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_SetVarAirSlash
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_SetVarLeafStorm
+RotomsRoom_GetRotomForEnter:
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_SetVarOverheat
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_SetVarBlizzard
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_SetVarHydroPump
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_SetVarAirSlash
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_SetVarLeafStorm
     CountRepeatedSpeciesInParty VAR_RESULT, SPECIES_ROTOM
     GoToIfEq VAR_RESULT, 1, RotomsRoom_GetRotomPartySlot
-    GoTo _0403
+    GoTo RotomsRoom_ChooseRotomForEnter
     End
 
-_0254:
+RotomsRoom_EnterMotorMenu:
     InitLocalTextMenu 31, 11, 0, VAR_RESULT
     SetMenuXOriginToRight
-    AddMenuEntryImm 15, 0
-    AddMenuEntryImm 16, 1
-    AddMenuEntryImm 14, 2
+    AddMenuEntryImm RotomsRoom_Text_Yes, 0
+    AddMenuEntryImm RotomsRoom_Text_No, 1
+    AddMenuEntryImm RotomsRoom_Text_Recall, 2
     ShowMenu
     SetVar VAR_0x8008, VAR_RESULT
-    GoToIfEq VAR_0x8008, 0, _01F8
-    GoToIfEq VAR_0x8008, 2, _0295
-    GoTo RotomsRoom_RotomGaveUpEnteringTheMotor
+    GoToIfEq VAR_0x8008, 0, RotomsRoom_GetRotomForEnter
+    GoToIfEq VAR_0x8008, 2, RotomsRoom_GetRotomForRecall
+    GoTo RotomsRoom_RotomGaveUpEnteringMotor
     End
 
-_0295:
+RotomsRoom_GetRotomForRecall:
     GetPartyRotomCountAndFirst VAR_0x8003, VAR_RESULT
-    SetVar LOCALID_PARTY_SLOT, VAR_RESULT
-    GoToIfGe VAR_0x8003, 2, RotomsRoom_ChooseARotom
-    GoTo _02B6
+    SetVar LOCAL_VAR_PARTY_SLOT, VAR_RESULT
+    GoToIfGe VAR_0x8003, 2, RotomsRoom_ChooseRotomForRecall
+    GoTo RotomsRoom_RecallRotom
     End
 
-_02B6:
-    BufferPartyMonNickname 0, LOCALID_PARTY_SLOT
+RotomsRoom_RecallRotom:
+    BufferPartyMonNickname 0, LOCAL_VAR_PARTY_SLOT
     Message RotomsRoom_Text_PokemonEmergedFromTheMotor
-    SetRotomForm LOCALID_PARTY_SLOT, 0, 0, ROTOM_FORM_BASE
+    SetRotomForm LOCAL_VAR_PARTY_SLOT, 0, 0, ROTOM_FORM_BASE
     FadeScreenOut
     WaitFadeScreen
     CloseMessage
-    GetPartyMonForm2 LOCALID_PARTY_SLOT, LOCALID_ROTOM_FORM
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_AddMicrowaveOven
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_AddRotaryFan
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_AddRefrigerator
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_AddWashingMachine
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_AddLawnMower
-    GoTo _0325
+    GetPartyMonForm2 LOCAL_VAR_PARTY_SLOT, LOCAL_VAR_ROTOM_FORM
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_AddMicrowave
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_AddFan
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_AddRefrigerator
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_AddWashingMachine
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_AddLawnMower
+    GoTo RotomsRoom_WarpInPlace
     End
 
-_0325:
+RotomsRoom_WarpInPlace:
     GetPlayerMapPos VAR_0x8006, VAR_0x8007
     GetPlayerDir VAR_RESULT
     Warp MAP_HEADER_ROTOMS_ROOM, 0, VAR_0x8006, VAR_0x8007, VAR_RESULT
@@ -177,104 +178,104 @@ _0325:
     WaitFadeScreen
     End
 
-RotomsRoom_AddMicrowaveOven:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_MICROWAVE_OVEN
-    AddObject 0
+RotomsRoom_AddMicrowave:
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_MICROWAVE
+    AddObject LOCALID_MICROWAVE
     Return
 
 RotomsRoom_AddRefrigerator:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_REFRIGERATOR
-    AddObject 2
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_REFRIGERATOR
+    AddObject LOCALID_REFRIGERATOR
     Return
 
 RotomsRoom_AddWashingMachine:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_WASHING_MACHINE
-    AddObject 3
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_WASHING_MACHINE
+    AddObject LOCALID_WASHING_MACHINE
     Return
 
-RotomsRoom_AddRotaryFan:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_ROTARY_FAN
-    AddObject 1
+RotomsRoom_AddFan:
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_FAN
+    AddObject LOCALID_FAN
     Return
 
 RotomsRoom_AddLawnMower:
-    ClearFlag FLAG_ROTOM_ROOM_HIDE_LAWN_MOWER
-    AddObject 4
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_LAWN_MOWER
+    AddObject LOCALID_LAWN_MOWER
     Return
 
-RotomsRoom_ChooseARotom:
-    Message RotomsRoom_Text_WhichRotomAreYouChoosing
+RotomsRoom_ChooseRotomForRecall:
+    Message RotomsRoom_Text_ChooseWhichRotom
     FadeScreenOut
     WaitFadeScreen
     CloseMessage
     SelectMoveTutorPokemon
-    GetSelectedPartySlot LOCALID_PARTY_SLOT
+    GetSelectedPartySlot LOCAL_VAR_PARTY_SLOT
     ReturnToField
     FadeScreenIn
     WaitFadeScreen
-    GoToIfEq LOCALID_PARTY_SLOT, 0xFF, RotomsRoom_End
-    GetPartyMonSpecies LOCALID_PARTY_SLOT, VAR_RESULT
-    GoToIfEq VAR_RESULT, SPECIES_NONE, RotomsRoom_AnEggCantEnterAMotor
-    GoToIfNe VAR_RESULT, SPECIES_ROTOM, RotomsRoom_ThatPokemonCantEnterAMotor
-    GetPartyMonForm2 LOCALID_PARTY_SLOT, VAR_RESULT
-    GoToIfEq VAR_RESULT, 0, _03E8
-    GoTo _02B6
+    GoToIfEq LOCAL_VAR_PARTY_SLOT, PARTY_SLOT_NONE, RotomsRoom_End
+    GetPartyMonSpecies LOCAL_VAR_PARTY_SLOT, VAR_RESULT
+    GoToIfEq VAR_RESULT, SPECIES_NONE, RotomsRoom_EggCantEnter
+    GoToIfNe VAR_RESULT, SPECIES_ROTOM, RotomsRoom_ThatPokemonCantEnter
+    GetPartyMonForm2 LOCAL_VAR_PARTY_SLOT, VAR_RESULT
+    GoToIfEq VAR_RESULT, 0, RotomsRoom_RotomHasntEnteredMotor
+    GoTo RotomsRoom_RecallRotom
     End
 
-_03E8:
-    Message RotomsRoom_Text_ThatRotomHasntEnteredAMotor
-    GoTo RotomsRoom_CloseMessage
+RotomsRoom_RotomHasntEnteredMotor:
+    Message RotomsRoom_Text_RotomHasntEnteredMotor
+    GoTo RotomsRoom_ApplianceEnd
     End
 
 RotomsRoom_End:
     End
 
 RotomsRoom_GetRotomPartySlot:
-    FindPartySlotWithSpecies LOCALID_PARTY_SLOT, SPECIES_ROTOM
-    GoTo _0473
+    FindPartySlotWithSpecies LOCAL_VAR_PARTY_SLOT, SPECIES_ROTOM
+    GoTo RotomsRoom_EnterMotorCheckMove
     End
 
-_0403:
-    Message RotomsRoom_Text_WhichRotomAreYouChoosing
+RotomsRoom_ChooseRotomForEnter:
+    Message RotomsRoom_Text_ChooseWhichRotom
     FadeScreenOut
     WaitFadeScreen
     CloseMessage
     SelectMoveTutorPokemon
-    GetSelectedPartySlot LOCALID_PARTY_SLOT
+    GetSelectedPartySlot LOCAL_VAR_PARTY_SLOT
     ReturnToField
     FadeScreenIn
     WaitFadeScreen
-    GoToIfEq LOCALID_PARTY_SLOT, 0xFF, RotomsRoom_RotomGaveUpEnteringTheMotor
-    GetPartyMonSpecies LOCALID_PARTY_SLOT, VAR_RESULT
-    GoToIfEq VAR_RESULT, SPECIES_NONE, RotomsRoom_AnEggCantEnterAMotor
-    GoToIfNe VAR_RESULT, SPECIES_ROTOM, RotomsRoom_ThatPokemonCantEnterAMotor
-    GoTo _0473
+    GoToIfEq LOCAL_VAR_PARTY_SLOT, PARTY_SLOT_NONE, RotomsRoom_RotomGaveUpEnteringMotor
+    GetPartyMonSpecies LOCAL_VAR_PARTY_SLOT, VAR_RESULT
+    GoToIfEq VAR_RESULT, SPECIES_NONE, RotomsRoom_EggCantEnter
+    GoToIfNe VAR_RESULT, SPECIES_ROTOM, RotomsRoom_ThatPokemonCantEnter
+    GoTo RotomsRoom_EnterMotorCheckMove
     End
 
-RotomsRoom_AnEggCantEnterAMotor:
-    Message RotomsRoom_Text_AnEggCantEnterAMotor
-    GoTo RotomsRoom_CloseMessage
+RotomsRoom_EggCantEnter:
+    Message RotomsRoom_Text_EggCantEnter
+    GoTo RotomsRoom_ApplianceEnd
     End
 
-RotomsRoom_ThatPokemonCantEnterAMotor:
-    Message RotomsRoom_Text_ThatPokemonCantEnterAMotor
-    GoTo RotomsRoom_CloseMessage
+RotomsRoom_ThatPokemonCantEnter:
+    Message RotomsRoom_Text_ThatPokemonCantEnter
+    GoTo RotomsRoom_ApplianceEnd
     End
 
-_0473:
-    CheckPartyMonHasMove VAR_RESULT, MOVE_OVERHEAT, LOCALID_PARTY_SLOT
+RotomsRoom_EnterMotorCheckMove:
+    CheckPartyMonHasMove VAR_RESULT, MOVE_OVERHEAT, LOCAL_VAR_PARTY_SLOT
     GoToIfEq VAR_RESULT, TRUE, RotomsRoom_SetVarMoveNone
-    CheckPartyMonHasMove VAR_RESULT, MOVE_BLIZZARD, LOCALID_PARTY_SLOT
+    CheckPartyMonHasMove VAR_RESULT, MOVE_BLIZZARD, LOCAL_VAR_PARTY_SLOT
     GoToIfEq VAR_RESULT, TRUE, RotomsRoom_SetVarMoveNone
-    CheckPartyMonHasMove VAR_RESULT, MOVE_HYDRO_PUMP, LOCALID_PARTY_SLOT
+    CheckPartyMonHasMove VAR_RESULT, MOVE_HYDRO_PUMP, LOCAL_VAR_PARTY_SLOT
     GoToIfEq VAR_RESULT, TRUE, RotomsRoom_SetVarMoveNone
-    CheckPartyMonHasMove VAR_RESULT, MOVE_AIR_SLASH, LOCALID_PARTY_SLOT
+    CheckPartyMonHasMove VAR_RESULT, MOVE_AIR_SLASH, LOCAL_VAR_PARTY_SLOT
     GoToIfEq VAR_RESULT, TRUE, RotomsRoom_SetVarMoveNone
-    CheckPartyMonHasMove VAR_RESULT, MOVE_LEAF_STORM, LOCALID_PARTY_SLOT
+    CheckPartyMonHasMove VAR_RESULT, MOVE_LEAF_STORM, LOCAL_VAR_PARTY_SLOT
     GoToIfEq VAR_RESULT, TRUE, RotomsRoom_SetVarMoveNone
-    GetPartyMonMoveCount VAR_RESULT, LOCALID_PARTY_SLOT
+    GetPartyMonMoveCount VAR_RESULT, LOCAL_VAR_PARTY_SLOT
     SetVar VAR_0x8002, VAR_RESULT
-    GoToIfEq VAR_RESULT, LEARNED_MOVES_MAX, RotomsRoom_Text_PokemonTryingToLearnMove
+    GoToIfEq VAR_RESULT, LEARNED_MOVES_MAX, RotomsRoom_AskLearnMove
     GoTo RotomsRoom_PokemonEnteredMotor
     End
 
@@ -284,17 +285,17 @@ RotomsRoom_SetVarMoveNone:
     End
 
 RotomsRoom_PokemonEnteredMotor:
-    BufferPartyMonNickname 0, LOCALID_PARTY_SLOT
+    BufferPartyMonNickname 0, LOCAL_VAR_PARTY_SLOT
     Message RotomsRoom_Text_PokemonEnteredMotor
     GoTo RotomsRoom_SetRotomForm
     End
 
-RotomsRoom_Text_PokemonTryingToLearnMove:
-    BufferPartyMonNickname 0, LOCALID_PARTY_SLOT
-    BufferMoveName 1, LOCALID_MOVE_TO_LEARN
-    Message RotomsRoom_Text_PokemonEnteredMotorTryingToLearnMove
+RotomsRoom_AskLearnMove:
+    BufferPartyMonNickname 0, LOCAL_VAR_PARTY_SLOT
+    BufferMoveName 1, LOCAL_VAR_MOVE_TO_LEARN
+    Message RotomsRoom_Text_TryingToLearnMove
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_DidNotLearnMoveEmergedFromTheMotor
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_DidNotLearnMoveEmergedFromMotor
     GoTo RotomsRoom_LearnMove
     End
 
@@ -302,28 +303,28 @@ RotomsRoom_LearnMove:
     FadeScreenOut
     WaitFadeScreen
     CloseMessage
-    OpenSummaryScreenTeachMove LOCALID_PARTY_SLOT, LOCALID_MOVE_TO_LEARN
+    OpenSummaryScreenTeachMove LOCAL_VAR_PARTY_SLOT, LOCAL_VAR_MOVE_TO_LEARN
     GetSummarySelectedMoveSlot VAR_0x8002
     ReturnToField
     FadeScreenIn
     WaitFadeScreen
     GoToIfEq VAR_0x8002, LEARNED_MOVES_MAX, RotomsRoom_GiveUpLearningMove
-    GetPartyMonMove VAR_RESULT, LOCALID_PARTY_SLOT, VAR_0x8002
+    GetPartyMonMove VAR_RESULT, LOCAL_VAR_PARTY_SLOT, VAR_0x8002
     BufferMoveName 1, VAR_RESULT
     Message RotomsRoom_Text_TheMoveWillBeForgotten
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_DidNotLearnMoveEmergedFromTheMotor
-    BufferPartyMonNickname 0, LOCALID_PARTY_SLOT
-    GetPartyMonMove VAR_RESULT, LOCALID_PARTY_SLOT, VAR_0x8002
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_DidNotLearnMoveEmergedFromMotor
+    BufferPartyMonNickname 0, LOCAL_VAR_PARTY_SLOT
+    GetPartyMonMove VAR_RESULT, LOCAL_VAR_PARTY_SLOT, VAR_0x8002
     BufferMoveName 1, VAR_RESULT
     Message RotomsRoom_Text_12andPoof
     PlaySE SEQ_SE_DP_KON
     WaitSE SEQ_SE_DP_KON
     WaitTime 30, VAR_RESULT
-    Message RotomsRoom_Text_PokemonForgotHowToUseMove
+    Message RotomsRoom_Text_PokemonForgotMove
     WaitTime 32, VAR_RESULT
     PlayFanfare SEQ_FANFA1
-    BufferMoveName 1, LOCALID_MOVE_TO_LEARN
+    BufferMoveName 1, LOCAL_VAR_MOVE_TO_LEARN
     Message RotomsRoom_Text_PokemonLearnedMove
     WaitFanfare
     WaitTime 16, VAR_RESULT
@@ -331,105 +332,105 @@ RotomsRoom_LearnMove:
     End
 
 RotomsRoom_GiveUpLearningMove:
-    BufferMoveName 1, LOCALID_MOVE_TO_LEARN
+    BufferMoveName 1, LOCAL_VAR_MOVE_TO_LEARN
     Message RotomsRoom_Text_GiveUpLearningMove
     ShowYesNoMenu VAR_RESULT
     GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_LearnMove
-    GoTo RotomsRoom_DidNotLearnMoveEmergedFromTheMotor
+    GoTo RotomsRoom_DidNotLearnMoveEmergedFromMotor
     End
 
-RotomsRoom_DidNotLearnMoveEmergedFromTheMotor:
-    BufferPartyMonNickname 0, LOCALID_PARTY_SLOT
-    BufferMoveName 1, LOCALID_MOVE_TO_LEARN
-    Message RotomsRoom_Text_PokemonDidNotLearnMoveEmergedFromTheMotor
-    GoTo RotomsRoom_CloseMessage
+RotomsRoom_DidNotLearnMoveEmergedFromMotor:
+    BufferPartyMonNickname 0, LOCAL_VAR_PARTY_SLOT
+    BufferMoveName 1, LOCAL_VAR_MOVE_TO_LEARN
+    Message RotomsRoom_Text_DidNotLearnMoveEmergedFromMotor
+    GoTo RotomsRoom_ApplianceEnd
     End
 
 RotomsRoom_SetRotomForm:
-    SetRotomForm LOCALID_PARTY_SLOT, VAR_0x8002, LOCALID_MOVE_TO_LEARN, LOCALID_ROTOM_FORM
+    SetRotomForm LOCAL_VAR_PARTY_SLOT, VAR_0x8002, LOCAL_VAR_MOVE_TO_LEARN, LOCAL_VAR_ROTOM_FORM
     FadeScreenOut
     WaitFadeScreen
     CloseMessage
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_RemoveMicrowaveOven
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_RemoveRotaryFan
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_RemoveRefrigerator
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_RemoveWashingMachine
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_RemoveLawnMower
-    GoToIfUnset FLAG_UNK_0x0077, _080C
-    GoTo _0325
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_RemoveMicrowave
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_RemoveFan
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_RemoveRefrigerator
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_RemoveWashingMachine
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_RemoveLawnMower
+    GoToIfUnset FLAG_USED_ROTOM_APPLIANCE, RotomsRoom_SetStateEnterProfRowan
+    GoTo RotomsRoom_WarpInPlace
     End
 
-RotomsRoom_RemoveMicrowaveOven:
-    RemoveObject 0
+RotomsRoom_RemoveMicrowave:
+    RemoveObject LOCALID_MICROWAVE
     Return
 
 RotomsRoom_RemoveRefrigerator:
-    RemoveObject 2
+    RemoveObject LOCALID_REFRIGERATOR
     Return
 
 RotomsRoom_RemoveWashingMachine:
-    RemoveObject 3
+    RemoveObject LOCALID_WASHING_MACHINE
     Return
 
-RotomsRoom_RemoveRotaryFan:
-    RemoveObject 1
+RotomsRoom_RemoveFan:
+    RemoveObject LOCALID_FAN
     Return
 
 RotomsRoom_RemoveLawnMower:
-    RemoveObject 4
+    RemoveObject LOCALID_LAWN_MOWER
     Return
 
 RotomsRoom_SetVarOverheat:
-    SetVar LOCALID_MOVE_TO_LEARN, MOVE_OVERHEAT
+    SetVar LOCAL_VAR_MOVE_TO_LEARN, MOVE_OVERHEAT
     Return
 
 RotomsRoom_SetVarBlizzard:
-    SetVar LOCALID_MOVE_TO_LEARN, MOVE_BLIZZARD
+    SetVar LOCAL_VAR_MOVE_TO_LEARN, MOVE_BLIZZARD
     Return
 
 RotomsRoom_SetVarHydroPump:
-    SetVar LOCALID_MOVE_TO_LEARN, MOVE_HYDRO_PUMP
+    SetVar LOCAL_VAR_MOVE_TO_LEARN, MOVE_HYDRO_PUMP
     Return
 
 RotomsRoom_SetVarAirSlash:
-    SetVar LOCALID_MOVE_TO_LEARN, MOVE_AIR_SLASH
+    SetVar LOCAL_VAR_MOVE_TO_LEARN, MOVE_AIR_SLASH
     Return
 
 RotomsRoom_SetVarLeafStorm:
-    SetVar LOCALID_MOVE_TO_LEARN, MOVE_LEAF_STORM
+    SetVar LOCAL_VAR_MOVE_TO_LEARN, MOVE_LEAF_STORM
     Return
 
-RotomsRoom_ItsAMicrowaveOvenRotomWantsToGoIntoTheMotor:
-    Message RotomsRoom_Text_ItsAMicrowaveOvenRotomWantsToGoIntoTheMotor
+RotomsRoom_AllowRotomEnterMicrowave:
+    Message RotomsRoom_Text_AllowRotomEnterMicrowave
     Return
 
-RotomsRoom_ItsARefrigeratorRotomWantsToGoIntoTheMotor:
-    Message RotomsRoom_Text_ItsARefrigeratorRotomWantsToGoIntoTheMotor
+RotomsRoom_AllowRotomEnterRefrigerator:
+    Message RotomsRoom_Text_AllowRotomEnterRefrigerator
     Return
 
-RotomsRoom_ItsAWashingMachineRotomWantsToGoIntoTheMotor:
-    Message RotomsRoom_Text_ItsAWashingMachineRotomWantsToGoIntoTheMotor
+RotomsRoom_AllowRotomEnterWashingMachine:
+    Message RotomsRoom_Text_AllowRotomEnterWashingMachine
     Return
 
-RotomsRoom_ItsARotaryFanRotomWantsToGoIntoTheMotor:
-    Message RotomsRoom_Text_ItsARotaryFanRotomWantsToGoIntoTheMotor
+RotomsRoom_AllowRotomEnterFan:
+    Message RotomsRoom_Text_AllowRotomEnterFan
     Return
 
-RotomsRoom_ItsALawnMowerRotomWantsToGoIntoTheMotor:
-    Message RotomsRoom_Text_ItsALawnMowerRotomWantsToGoIntoTheMotor
+RotomsRoom_AllowRotomEnterLawnMower:
+    Message RotomsRoom_Text_AllowRotomEnterLawnMower
     Return
 
 RotomsRoom_ItsAnAppliance:
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_ItsAMicrowaveOven
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_ItsARefrigerator
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_ItsAWashingMachine
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_ItsARotaryFan
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_ItsALawnMower
-    GoTo RotomsRoom_CloseMessage
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_ItsAMicrowave
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_ItsARefrigerator
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_ItsAWashingMachine
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_ItsAFan
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_ItsALawnMower
+    GoTo RotomsRoom_ApplianceEnd
     End
 
-RotomsRoom_ItsAMicrowaveOven:
-    Message RotomsRoom_Text_ItsAMicrowaveOven
+RotomsRoom_ItsAMicrowave:
+    Message RotomsRoom_Text_ItsAMicrowave
     Return
 
 RotomsRoom_ItsARefrigerator:
@@ -440,146 +441,146 @@ RotomsRoom_ItsAWashingMachine:
     Message RotomsRoom_Text_ItsAWashingMachine
     Return
 
-RotomsRoom_ItsARotaryFan:
-    Message RotomsRoom_Text_ItsARotaryFan
+RotomsRoom_ItsAFan:
+    Message RotomsRoom_Text_ItsAFan
     Return
 
 RotomsRoom_ItsALawnMower:
     Message RotomsRoom_Text_ItsALawnMower
     Return
 
-RotomsRoom_RotomGaveUpEnteringTheMotor:
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_RotomGaveUpEnteringTheMicrowaveOven
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_RotomGaveUpEnteringTheRefrigerator
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_RotomGaveUpEnteringTheWashingMachine
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_RotomGaveUpEnteringTheRotaryFan
-    CallIfEq LOCALID_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_RotomGaveUpEnteringTheLawnMower
-    GoTo RotomsRoom_CloseMessage
+RotomsRoom_RotomGaveUpEnteringMotor:
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_HEAT, RotomsRoom_RotomGaveUpEnteringMicrowave
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FROST, RotomsRoom_RotomGaveUpEnteringRefrigerator
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_WASH, RotomsRoom_RotomGaveUpEnteringWashingMachine
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_FAN, RotomsRoom_RotomGaveUpEnteringFan
+    CallIfEq LOCAL_VAR_ROTOM_FORM, ROTOM_FORM_MOW, RotomsRoom_RotomGaveUpEnteringLawnMower
+    GoTo RotomsRoom_ApplianceEnd
     End
 
-RotomsRoom_RotomGaveUpEnteringTheMicrowaveOven:
-    Message RotomsRoom_Text_RotomGaveUpEnteringTheMicrowaveOvensMotor
+RotomsRoom_RotomGaveUpEnteringMicrowave:
+    Message RotomsRoom_Text_RotomGaveUpEnteringMicrowave
     Return
 
-RotomsRoom_RotomGaveUpEnteringTheRefrigerator:
-    Message RotomsRoom_Text_RotomGaveUpEnteringTheRefrigeratorsMotor
+RotomsRoom_RotomGaveUpEnteringRefrigerator:
+    Message RotomsRoom_Text_RotomGaveUpEnteringRefrigerator
     Return
 
-RotomsRoom_RotomGaveUpEnteringTheWashingMachine:
-    Message RotomsRoom_Text_RotomGaveUpEnteringTheWashingMachinesMotor
+RotomsRoom_RotomGaveUpEnteringWashingMachine:
+    Message RotomsRoom_Text_RotomGaveUpEnteringWashingMachine
     Return
 
-RotomsRoom_RotomGaveUpEnteringTheRotaryFan:
-    Message RotomsRoom_Text_RotomGaveUpEnteringTheRotaryFansMotor
+RotomsRoom_RotomGaveUpEnteringFan:
+    Message RotomsRoom_Text_RotomGaveUpEnteringFan
     Return
 
-RotomsRoom_RotomGaveUpEnteringTheLawnMower:
-    Message RotomsRoom_Text_RotomGaveUpEnteringTheLawnMowersMotor
+RotomsRoom_RotomGaveUpEnteringLawnMower:
+    Message RotomsRoom_Text_RotomGaveUpEnteringLawnMower
     Return
 
-RotomsRoom_CloseMessage:
+RotomsRoom_ApplianceEnd:
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 RotomsRoom_MysteriousNotebook:
-    EventMessage RotomsRoom_Text_ThereIsAMysteriousNotebookHere
+    EventMessage RotomsRoom_Text_InformationAboutRotom
     End
 
-_07BB:
+RotomsRoom_ApplianceSpot:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     GetPartyRotomCountAndFirst VAR_0x8003, VAR_RESULT
-    GoToIfEq VAR_0x8003, 0, _0801
-    Message RotomsRoom_Text_OhRotomWantsToRevertToItsOriginalForm
+    GoToIfEq VAR_0x8003, 0, RotomsRoom_ThereWasAnApplianceHere
+    Message RotomsRoom_Text_RevertRotomToOriginalForm
     InitLocalTextMenu 31, 15, 0, VAR_RESULT
     SetMenuXOriginToRight
-    AddMenuEntryImm 14, 0
+    AddMenuEntryImm RotomsRoom_Text_Recall, 0
     ShowMenu
     SetVar VAR_0x8008, VAR_RESULT
-    GoToIfEq VAR_0x8008, 0, _0295
+    GoToIfEq VAR_0x8008, 0, RotomsRoom_GetRotomForRecall
     CloseMessage
     ReleaseAll
     End
 
-_0801:
+RotomsRoom_ThereWasAnApplianceHere:
     Message RotomsRoom_Text_ThereWasAnApplianceHere
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
-_080C:
-    SetFlag FLAG_UNK_0x0077
-    SetVar VAR_UNK_0x411B, 1
-    GoTo _0325
+RotomsRoom_SetStateEnterProfRowan:
+    SetFlag FLAG_USED_ROTOM_APPLIANCE
+    SetVar VAR_ROTOMS_ROOM_STATE, 1
+    GoTo RotomsRoom_WarpInPlace
     End
 
-RotomsRoom_ProfessorRowan:
+RotomsRoom_OnFrameProfRowan:
     LockAll
-    ClearFlag FLAG_UNK_0x02C0
+    ClearFlag FLAG_HIDE_ROTOMS_ROOM_PROF_ROWAN
     PlaySE SEQ_SE_DP_KAIDAN2
-    AddObject 6
+    AddObject LOCALID_PROF_ROWAN
     WaitSE SEQ_SE_DP_KAIDAN2
-    ApplyMovement LOCALID_PLAYER, _08AC
-    ApplyMovement 6, _08D4
+    ApplyMovement LOCALID_PLAYER, RotomsRoom_Movement_PlayerNoticeRowan
+    ApplyMovement LOCALID_PROF_ROWAN, RotomsRoom_Movement_RowanEnter
     WaitMovement
     BufferPlayerName 0
-    Message RotomsRoom_Text_RowanAhImagineFindingYouHere
+    Message RotomsRoom_Text_ImagineFindingYouHere
     CloseMessage
     GetPlayerMapPos VAR_0x8006, VAR_0x8007
-    CallIfGe VAR_0x8006, 10, _08A8
-    CallIfLe VAR_0x8006, 4, _08AA
-    ApplyMovement 6, _08DC
+    CallIfGe VAR_0x8006, 10, RotomsRoom_EastReturn
+    CallIfLe VAR_0x8006, 4, RotomsRoom_WestReturn
+    ApplyMovement LOCALID_PROF_ROWAN, RotomsRoom_Movement_RowanWalkAround
     WaitMovement
-    Message RotomsRoom_Text_APokemonThatSlipsIntoElectricAppliancesYouSay
+    Message RotomsRoom_Text_PokemonThatSlipsIntoAppliances
     CloseMessage
-    ApplyMovement 6, _08F4
+    ApplyMovement LOCALID_PROF_ROWAN, RotomsRoom_Movement_RowanWalkBack
     WaitMovement
-    Message RotomsRoom_Text_AnywayThisRotomWhatAnInterestingPokemon
+    Message RotomsRoom_Text_RotomInterestingPokemon
     CloseMessage
-    ApplyMovement 6, _0900
+    ApplyMovement LOCALID_PROF_ROWAN, RotomsRoom_Movement_RowanLeave
     WaitMovement
     PlaySE SEQ_SE_DP_KAIDAN2
-    RemoveObject 6
+    RemoveObject LOCALID_PROF_ROWAN
     WaitSE SEQ_SE_DP_KAIDAN2
-    SetVar VAR_UNK_0x411B, 2
+    SetVar VAR_ROTOMS_ROOM_STATE, 2
     ReleaseAll
     End
 
-_08A8:
+RotomsRoom_EastReturn:
     Return
 
-_08AA:
+RotomsRoom_WestReturn:
     Return
 
     .balign 4, 0
-_08AC:
+RotomsRoom_Movement_PlayerNoticeRowan:
     WalkOnSpotNormalSouth
     EmoteExclamationMark
     EndMovement
 
-RotomsRoom_UnusedMovement:
+RotomsRoom_Movement_Unused:
     WalkOnSpotNormalWest
     EndMovement
 
-RotomsRoom_UnusedMovement2:
+RotomsRoom_Movement_Unused2:
     WalkOnSpotNormalEast
     EndMovement
 
-RotomsRoom_UnusedMovement3:
+RotomsRoom_Movement_Unused3:
     Delay8
     WalkOnSpotNormalSouth
     EndMovement
 
     .balign 4, 0
-_08D4:
+RotomsRoom_Movement_RowanEnter:
     WalkNormalNorth 2
     EndMovement
 
     .balign 4, 0
-_08DC:
+RotomsRoom_Movement_RowanWalkAround:
     WalkNormalWest 2
     WalkOnSpotNormalNorth
     Delay8 2
@@ -588,13 +589,13 @@ _08DC:
     EndMovement
 
     .balign 4, 0
-_08F4:
+RotomsRoom_Movement_RowanWalkBack:
     WalkNormalWest 2
     WalkOnSpotNormalNorth
     EndMovement
 
     .balign 4, 0
-_0900:
+RotomsRoom_Movement_RowanLeave:
     WalkNormalSouth 2
     EndMovement
 
@@ -602,43 +603,43 @@ RotomsRoom_OldNotebook:
     PlaySE SEQ_SE_CONFIRM
     LockAll
     FacePlayer
-    Message RotomsRoom_Text_ItsAnOldNotebook
+    Message RotomsRoom_Text_ReadOldNotebook
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_OurEncounterWasASuddenOne
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_PokemonEmergedFromLawnMower
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_ThePokemonHoveredInTheAir
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_PokemonHoveredInTheAir
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_ThePokemonOnlyWishedToBeFriends
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_INameThisRotom
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_RotomIsAPokemonThatIsSensational
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_AbilityToEnterMachinery
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_RotomAndIBecameFastFriends
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_RotomAndIBecameFriends
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_AFeelingOfMischiefGotTheBetterOfMe
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_FeelingOfMischief
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_WhenICameToRotomDisappeared
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_RotomDisappeared
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_MySearchForRotomCarriedMeFarFromHome
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_SearchForRotom
     ShowYesNoMenu VAR_RESULT
-    GoToIfEq VAR_RESULT, MENU_NO, _09CF
-    Message RotomsRoom_Text_TheRobotEyesLitUpHappilyAsIHeldIt
-    GoTo _09D5
+    GoToIfEq VAR_RESULT, MENU_NO, RotomsRoom_StopReading
+    Message RotomsRoom_Text_NotebookEnds
+    GoTo RotomsRoom_NotebookEnd
     End
 
-_09CF:
+RotomsRoom_StopReading:
     CloseMessage
     ReleaseAll
     End
 
-_09D5:
+RotomsRoom_NotebookEnd:
     WaitButton
     CloseMessage
     ReleaseAll
diff --git a/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s b/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s
index ac162a2b65..78c4327c84 100644
--- a/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s
+++ b/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s
@@ -1,8 +1,8 @@
 #include "macros/scrcmd.inc"
 
 
-    ScriptEntry _0006
+    ScriptEntry SunyshoreCityUnknownHouse1_Unused
     ScriptEntryEnd
 
-_0006:
+SunyshoreCityUnknownHouse1_Unused:
     End
diff --git a/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s b/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s
index ac162a2b65..4b7b08bac8 100644
--- a/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s
+++ b/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s
@@ -1,8 +1,8 @@
 #include "macros/scrcmd.inc"
 
 
-    ScriptEntry _0006
+    ScriptEntry SunyshoreCityUnknownHouse2_Unused
     ScriptEntryEnd
 
-_0006:
+SunyshoreCityUnknownHouse2_Unused:
     End
diff --git a/res/field/scripts/scripts_veilstone_store_1f.s b/res/field/scripts/scripts_veilstone_store_1f.s
index 3193592985..e47dfa9c29 100644
--- a/res/field/scripts/scripts_veilstone_store_1f.s
+++ b/res/field/scripts/scripts_veilstone_store_1f.s
@@ -1,8 +1,8 @@
 #include "macros/scrcmd.inc"
 #include "res/text/bank/veilstone_store_1f.h"
 
-#define LOCALID_ACCESSORY_ID VAR_0x8004
-#define LOCALID_COUNT     VAR_0x8005
+#define LOCAL_VAR_ACCESSORY_ID VAR_0x8004
+#define LOCAL_VAR_COUNT        VAR_0x8005
 
     ScriptEntry VeilstoneStore1F_Attendant
     ScriptEntry VeilstoneStore1F_MiddleAgedMan
@@ -51,10 +51,10 @@ VeilstoneStore1F_Socialite:
     CallIfEq VAR_RESULT, SPECIES_TURTWIG, VeilstoneStore1F_Socialite_Turtwig
     CallIfEq VAR_RESULT, SPECIES_CHIMCHAR, VeilstoneStore1F_Socialite_Chimchar
     CallIfEq VAR_RESULT, SPECIES_PIPLUP, VeilstoneStore1F_Socialite_Piplup
-    SetVar VAR_VEILSTONE_STORE_MASK, LOCALID_ACCESSORY_ID
-    BufferAccessoryNameWithArticle 0, LOCALID_ACCESSORY_ID
+    SetVar VAR_VEILSTONE_STORE_MASK, LOCAL_VAR_ACCESSORY_ID
+    BufferAccessoryNameWithArticle 0, LOCAL_VAR_ACCESSORY_ID
     Message VeilstoneStore1F_Text_IMadeAnAccessory
-    SetVar LOCALID_COUNT, 1
+    SetVar LOCAL_VAR_COUNT, 1
     Common_GiveAccessoryWaitForConfirm
     SetFlag FLAG_VEILSTONE_STORE_1F_RECEIVED_MASK
     CloseMessage
@@ -70,15 +70,15 @@ VeilstoneStore1F_Socialite_AfterMaskGiven:
     End
 
 VeilstoneStore1F_Socialite_Turtwig:
-    SetVar LOCALID_ACCESSORY_ID, ACCESSORY_PIPLUP_MASK
+    SetVar LOCAL_VAR_ACCESSORY_ID, ACCESSORY_PIPLUP_MASK
     Return
 
 VeilstoneStore1F_Socialite_Chimchar:
-    SetVar LOCALID_ACCESSORY_ID, ACCESSORY_TURTWIG_MASK
+    SetVar LOCAL_VAR_ACCESSORY_ID, ACCESSORY_TURTWIG_MASK
     Return
 
 VeilstoneStore1F_Socialite_Piplup:
-    SetVar LOCALID_ACCESSORY_ID, ACCESSORY_CHIMCHAR_MASK
+    SetVar LOCAL_VAR_ACCESSORY_ID, ACCESSORY_CHIMCHAR_MASK
     Return
 
     .balign 4, 0
diff --git a/res/field/scripts/scripts_veilstone_store_2f.s b/res/field/scripts/scripts_veilstone_store_2f.s
index d49a961bfd..186f97c4b1 100644
--- a/res/field/scripts/scripts_veilstone_store_2f.s
+++ b/res/field/scripts/scripts_veilstone_store_2f.s
@@ -29,7 +29,7 @@ VeilstoneStore2F_Attendant:
 
 VeilstoneStore2F_AttendantPersonalized:
     BufferPlayerName 0
-    Message VeilstoneStore2F_Text_MayIHelpYouPersonalized
+    Message VeilstoneStore2F_Text_PlayerMayIHelpYou
     InitGlobalTextMenu 1, 1, 0, VAR_RESULT
     AddMenuEntryImm MenuEntries_Text_WhatIsRecommended, 0
     AddMenuEntryImm MenuEntries_Text_NothingThanks, 1
@@ -77,7 +77,7 @@ VeilstoneStore2F_AttendantXAccuracy:
     End
 
 VeilstoneStore2F_Lady:
-    NPCMessage VeilstoneStore2F_Text_MatchingDressesForMeAndMyPokemon
+    NPCMessage VeilstoneStore2F_Text_MatchingDresses
     End
 
 VeilstoneStore2F_BugCatcher1:
diff --git a/res/field/scripts/scripts_veilstone_store_3f.s b/res/field/scripts/scripts_veilstone_store_3f.s
index 72341acc90..6aa99b13ab 100644
--- a/res/field/scripts/scripts_veilstone_store_3f.s
+++ b/res/field/scripts/scripts_veilstone_store_3f.s
@@ -28,7 +28,7 @@ VeilstoneStore3F_Attendant:
 
 VeilstoneStore3F_AttendantPersonalized:
     BufferPlayerName 0
-    Message VeilstoneStore3F_Text_MayIHelpYouPersonalized
+    Message VeilstoneStore3F_Text_PlayerMayIHelpYou
     InitGlobalTextMenu 1, 1, 0, VAR_RESULT
     AddMenuEntryImm MenuEntries_Text_WhatIsRecommended, 0
     AddMenuEntryImm MenuEntries_Text_NothingThanks, 1
@@ -48,21 +48,21 @@ VeilstoneStore3F_AttendantPleaseEnjoyYourself:
     End
 
 VeilstoneStore3F_AttendantFalseSwipe:
-    Message VeilstoneStore3F_Text_FalseSwipeMakesPokemonEasierToCatch
+    Message VeilstoneStore3F_Text_FalseSwipeMakesCatchingEasier
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 VeilstoneStore3F_AttendantFireBlast:
-    Message VeilstoneStore3F_Text_ForFireTypesSuggestFireBlast
+    Message VeilstoneStore3F_Text_FireBlastForFireTypes
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 VeilstoneStore3F_AttendantProtect:
-    Message VeilstoneStore3F_Text_ProtectIsForDodgingAttacks
+    Message VeilstoneStore3F_Text_ProtectForDodgingAttacks
     WaitButton
     CloseMessage
     ReleaseAll
@@ -84,7 +84,7 @@ VeilstoneStore3F_Guitarist:
     End
 
 VeilstoneStore3F_Breeder:
-    NPCMessage VeilstoneStore3F_Text_WouldLoveToBuyAllTheMerchandise
+    NPCMessage VeilstoneStore3F_Text_WantToBuyAllMerchandise
     End
 
 VeilstoneStore3F_TopVendor:
diff --git a/res/field/scripts/scripts_veilstone_store_4f.s b/res/field/scripts/scripts_veilstone_store_4f.s
index 852a108059..fc504c2981 100644
--- a/res/field/scripts/scripts_veilstone_store_4f.s
+++ b/res/field/scripts/scripts_veilstone_store_4f.s
@@ -28,7 +28,7 @@ VeilstoneStore4F_Attendant:
 
 VeilstoneStore4F_AttendantPersonalized:
     BufferPlayerName 0
-    Message VeilstoneStore4F_Text_MayIHelpYouPersonalized
+    Message VeilstoneStore4F_Text_PlayerMayIHelpYou
     InitGlobalTextMenu 1, 1, 0, VAR_RESULT
     AddMenuEntryImm MenuEntries_Text_WhatIsRecommended, 0
     AddMenuEntryImm MenuEntries_Text_NothingThanks, 1
@@ -48,43 +48,43 @@ VeilstoneStore4F_AttendantPleaseEnjoyYourself:
     End
 
 VeilstoneStore4F_AttendantYellowCushion:
-    Message VeilstoneStore4F_Text_YellowCushionIsSoftAndFirm
+    Message VeilstoneStore4F_Text_YellowCushionIsPopular
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 VeilstoneStore4F_AttendantCupboards:
-    Message VeilstoneStore4F_Text_SurprisedHowManyBuyCupboards
+    Message VeilstoneStore4F_Text_ManyBuyCupboards
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 VeilstoneStore4F_AttendantBuizelDoll:
-    Message VeilstoneStore4F_Text_BuizelDollIsVeryPopular
+    Message VeilstoneStore4F_Text_BuizelDollVeryPopular
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 VeilstoneStore4F_AttendantMantykeDoll:
-    Message VeilstoneStore4F_Text_MantykeDollHasBeenHotSeller
+    Message VeilstoneStore4F_Text_MantykeDollHotSeller
     WaitButton
     CloseMessage
     ReleaseAll
     End
 
 VeilstoneStore4F_NinjaBoy:
-    NPCMessage VeilstoneStore4F_Text_ChuckAQuickBallOrTimerBall
+    NPCMessage VeilstoneStore4F_Text_QuickBallOrTimerBall
     End
 
 VeilstoneStore4F_Pokefan:
-    NPCMessage VeilstoneStore4F_Text_ThatBoySaysHeIsTrainingHisImage
+    NPCMessage VeilstoneStore4F_Text_BoyIsTrainingHisImage
     End
 
 VeilstoneStore4F_SchoolBoy:
-    NPCMessage VeilstoneStore4F_Text_NeedAnotherCopyOfGameToChallengePapa
+    NPCMessage VeilstoneStore4F_Text_NeedAnotherCopyOfGame
     End
 
 VeilstoneStore4F_TopDecorVendor:
diff --git a/res/field/scripts/scripts_veilstone_store_5f.s b/res/field/scripts/scripts_veilstone_store_5f.s
index 048e3203c7..fea54d7382 100644
--- a/res/field/scripts/scripts_veilstone_store_5f.s
+++ b/res/field/scripts/scripts_veilstone_store_5f.s
@@ -3,11 +3,11 @@
 #include "res/text/bank/menu_entries.h"
 
 
-#define LOCALID_DRINK_CHOICE      VAR_0x8000
-#define LOCALID_DRINK_ID          VAR_0x8001
-#define LOCALID_ITEM_ID           VAR_0x8004
-#define LOCALID_COUNT             VAR_0x8005
-#define LOCALID_DRINK_CHOICE_COPY VAR_0x8008
+#define LOCAL_VAR_DRINK_CHOICE      VAR_0x8000
+#define LOCAL_VAR_DRINK_ID          VAR_0x8001
+#define LOCAL_VAR_ITEM_ID           VAR_0x8004
+#define LOCAL_VAR_COUNT             VAR_0x8005
+#define LOCAL_VAR_DRINK_CHOICE_COPY VAR_0x8008
 
     ScriptEntry VeilstoneStore5F_BugCatcher
     ScriptEntry VeilstoneStore5F_MiddleAgedWoman
@@ -30,17 +30,17 @@ VeilstoneStore5F_Collector1:
     LockAll
     FacePlayer
     GoToIfSet FLAG_VEILSTONE_STORE_5F_RECEIVED_STICKY_BARB, VeilstoneStore5F_Collector1AfterItemGiven
-    Message VeilstoneStore5F_Text_AGiftOfThisStickyBarb
-    SetVar LOCALID_ITEM_ID, ITEM_STICKY_BARB
-    SetVar LOCALID_COUNT, 1
-    GoToIfCannotFitItem LOCALID_ITEM_ID, LOCALID_COUNT, VAR_RESULT, VeilstoneStore5F_Collector1BagIsFull
+    Message VeilstoneStore5F_Text_GiftThisStickyBarb
+    SetVar LOCAL_VAR_ITEM_ID, ITEM_STICKY_BARB
+    SetVar LOCAL_VAR_COUNT, 1
+    GoToIfCannotFitItem LOCAL_VAR_ITEM_ID, LOCAL_VAR_COUNT, VAR_RESULT, VeilstoneStore5F_Collector1BagIsFull
     Common_GiveItemQuantity
     SetFlag FLAG_VEILSTONE_STORE_5F_RECEIVED_STICKY_BARB
     GoTo VeilstoneStore5F_Collector1AfterItemGiven
     End
 
 VeilstoneStore5F_Collector1AfterItemGiven:
-    Message VeilstoneStore5F_Text_SticksToTheFoeAndInflictsDamage
+    Message VeilstoneStore5F_Text_SticksToFoeInflictsDamage
     WaitButton
     CloseMessage
     ReleaseAll
@@ -68,29 +68,29 @@ VeilstoneStore5F_VendingMachine:
     GoTo VeilstoneStore5F_VendingMachineMenu
 
 VeilstoneStore5F_VendingMachineMenu:
-    InitGlobalTextMenu 1, 1, 0, LOCALID_DRINK_CHOICE
+    InitGlobalTextMenu 1, 1, 0, LOCAL_VAR_DRINK_CHOICE
     AddMenuEntryImm MenuEntries_Text_FreshWater, 0
     AddMenuEntryImm MenuEntries_Text_SodaPop, 1
     AddMenuEntryImm MenuEntries_Text_Lemonade, 2
     AddMenuEntryImm MenuEntries_Text_NoThanks, 3
     ShowMenu
-    SetVar LOCALID_DRINK_CHOICE_COPY, LOCALID_DRINK_CHOICE
-    GoToIfEq LOCALID_DRINK_CHOICE_COPY, 0, VeilstoneStore5F_VendingMachineChooseFreshWater
-    GoToIfEq LOCALID_DRINK_CHOICE_COPY, 1, VeilstoneStore5F_VendingMachineChooseSodaPop
-    GoToIfEq LOCALID_DRINK_CHOICE_COPY, 2, VeilstoneStore5F_VendingMachineChooseLemonade
+    SetVar LOCAL_VAR_DRINK_CHOICE_COPY, LOCAL_VAR_DRINK_CHOICE
+    GoToIfEq LOCAL_VAR_DRINK_CHOICE_COPY, 0, VeilstoneStore5F_VendingMachineChooseFreshWater
+    GoToIfEq LOCAL_VAR_DRINK_CHOICE_COPY, 1, VeilstoneStore5F_VendingMachineChooseSodaPop
+    GoToIfEq LOCAL_VAR_DRINK_CHOICE_COPY, 2, VeilstoneStore5F_VendingMachineChooseLemonade
     Message VeilstoneStore5F_Text_DecidedNotToBuyADrink
     GoTo VeilstoneStore5F_VendingMachineClose
 
 VeilstoneStore5F_VendingMachineChooseFreshWater:
-    SetVar LOCALID_DRINK_ID, ITEM_FRESH_WATER
+    SetVar LOCAL_VAR_DRINK_ID, ITEM_FRESH_WATER
     GoTo VeilstoneStore5F_VendingMachineDispenseDrink
 
 VeilstoneStore5F_VendingMachineChooseSodaPop:
-    SetVar LOCALID_DRINK_ID, ITEM_SODA_POP
+    SetVar LOCAL_VAR_DRINK_ID, ITEM_SODA_POP
     GoTo VeilstoneStore5F_VendingMachineDispenseDrink
 
 VeilstoneStore5F_VendingMachineChooseLemonade:
-    SetVar LOCALID_DRINK_ID, ITEM_LEMONADE
+    SetVar LOCAL_VAR_DRINK_ID, ITEM_LEMONADE
     GoTo VeilstoneStore5F_VendingMachineDispenseDrink
 
 VeilstoneStore5F_VendingMachineCheckFreshWaterMoney:
@@ -121,31 +121,31 @@ VeilstoneStore5F_VendingMachineBuyLemonade:
     Return
 
 VeilstoneStore5F_VendingMachineDispenseDrink:
-    CallIfEq LOCALID_DRINK_CHOICE, 0, VeilstoneStore5F_VendingMachineCheckFreshWaterMoney
-    CallIfEq LOCALID_DRINK_CHOICE, 1, VeilstoneStore5F_VendingMachineCheckSodaPopMoney
-    CallIfEq LOCALID_DRINK_CHOICE, 2, VeilstoneStore5F_VendingMachineCheckLemonadeMoney
+    CallIfEq LOCAL_VAR_DRINK_CHOICE, 0, VeilstoneStore5F_VendingMachineCheckFreshWaterMoney
+    CallIfEq LOCAL_VAR_DRINK_CHOICE, 1, VeilstoneStore5F_VendingMachineCheckSodaPopMoney
+    CallIfEq LOCAL_VAR_DRINK_CHOICE, 2, VeilstoneStore5F_VendingMachineCheckLemonadeMoney
     GoToIfEq VAR_RESULT, 0, VeilstoneStore5F_VendingMachineNotEnoughMoney
-    GoToIfCannotFitItem LOCALID_DRINK_ID, 1, VAR_RESULT, VeilstoneStore5F_VendingMachineBagIsFull
-    CallIfEq LOCALID_DRINK_CHOICE, 0, VeilstoneStore5F_VendingMachineBuyFreshWater
-    CallIfEq LOCALID_DRINK_CHOICE, 1, VeilstoneStore5F_VendingMachineBuySodaPop
-    CallIfEq LOCALID_DRINK_CHOICE, 2, VeilstoneStore5F_VendingMachineBuyLemonade
+    GoToIfCannotFitItem LOCAL_VAR_DRINK_ID, 1, VAR_RESULT, VeilstoneStore5F_VendingMachineBagIsFull
+    CallIfEq LOCAL_VAR_DRINK_CHOICE, 0, VeilstoneStore5F_VendingMachineBuyFreshWater
+    CallIfEq LOCAL_VAR_DRINK_CHOICE, 1, VeilstoneStore5F_VendingMachineBuySodaPop
+    CallIfEq LOCAL_VAR_DRINK_CHOICE, 2, VeilstoneStore5F_VendingMachineBuyLemonade
     UpdateMoneyDisplay
-    BufferItemName 0, LOCALID_DRINK_ID
+    BufferItemName 0, LOCAL_VAR_DRINK_ID
     PlaySE SEQ_SE_DP_JIHANKI
-    BufferItemName 0, LOCALID_DRINK_ID
+    BufferItemName 0, LOCAL_VAR_DRINK_ID
     Message VeilstoneStore5F_Text_ACanDroppedDown
-    SetVar LOCALID_ITEM_ID, LOCALID_DRINK_ID
-    SetVar LOCALID_COUNT, 1
+    SetVar LOCAL_VAR_ITEM_ID, LOCAL_VAR_DRINK_ID
+    SetVar LOCAL_VAR_COUNT, 1
     Common_GiveItemQuantity
     // 1 in 64 chance for a bonus can
     GetRandom VAR_RESULT, 64
     GoToIfNe VAR_RESULT, 0, VeilstoneStore5F_VendingMachineBuyAnotherDrink
-    GoToIfCannotFitItem LOCALID_DRINK_ID, 1, VAR_RESULT, VeilstoneStore5F_VendingMachineBagIsFull
+    GoToIfCannotFitItem LOCAL_VAR_DRINK_ID, 1, VAR_RESULT, VeilstoneStore5F_VendingMachineBagIsFull
     PlaySE SEQ_SE_DP_JIHANKI
-    BufferItemName 0, LOCALID_DRINK_ID
+    BufferItemName 0, LOCAL_VAR_DRINK_ID
     Message VeilstoneStore5F_Text_ABonusCanDroppedDown
-    SetVar LOCALID_ITEM_ID, LOCALID_DRINK_ID
-    SetVar LOCALID_COUNT, 1
+    SetVar LOCAL_VAR_ITEM_ID, LOCAL_VAR_DRINK_ID
+    SetVar LOCAL_VAR_COUNT, 1
     Common_GiveItemQuantity
     GoTo VeilstoneStore5F_VendingMachineBuyAnotherDrink
 
diff --git a/res/field/scripts/scripts_veilstone_store_b1f.s b/res/field/scripts/scripts_veilstone_store_b1f.s
index 6e15264bc7..2d82df6fb8 100644
--- a/res/field/scripts/scripts_veilstone_store_b1f.s
+++ b/res/field/scripts/scripts_veilstone_store_b1f.s
@@ -1,13 +1,13 @@
 #include "macros/scrcmd.inc"
 #include "res/text/bank/veilstone_store_b1f.h"
 
-#define LOCALID_SPICINESS  VAR_0x8007
-#define LOCALID_DRYNESS    VAR_0x8000
-#define LOCALID_SWEETNESS  VAR_0x8001
-#define LOCALID_BITTERNESS VAR_0x8002
-#define LOCALID_SOURNESS   VAR_0x8003
+#define LOCAL_VAR_SPICINESS  VAR_0x8007
+#define LOCAL_VAR_DRYNESS    VAR_0x8000
+#define LOCAL_VAR_SWEETNESS  VAR_0x8001
+#define LOCAL_VAR_BITTERNESS VAR_0x8002
+#define LOCAL_VAR_SOURNESS   VAR_0x8003
 // All purchasable poffins have the same smoothness
-#define LOCALID_SMOOTHNESS 20
+#define LOCAL_VAR_SMOOTHNESS 20
 
     ScriptEntry VeilstoneStoreB1F_Gentleman
     ScriptEntry VeilstoneStoreB1F_Socialite1
@@ -24,7 +24,7 @@
     ScriptEntryEnd
 
 VeilstoneStoreB1F_Gentleman:
-    NPCMessage VeilstoneStoreB1F_Text_IBoughtAllTheRageCandyBars
+    NPCMessage VeilstoneStoreB1F_Text_BoughtAllRageCandyBars
     End
 
 VeilstoneStoreB1F_Socialite1:
@@ -32,7 +32,7 @@ VeilstoneStoreB1F_Socialite1:
     End
 
 VeilstoneStoreB1F_Socialite2:
-    NPCMessage VeilstoneStoreB1F_Text_FlavorsOfPoffinsAffectConditionOfPokemon
+    NPCMessage VeilstoneStoreB1F_Text_FlavorsAffectCondition
     End
 
 VeilstoneStoreB1F_Attendant1:
@@ -52,7 +52,7 @@ VeilstoneStoreB1F_ProfRowan:
     LockAll
     GoToIfSet FLAG_VEILSTONE_STORE_B1F_SPOKEN_TO_PROF_ROWAN, VeilstoneStoreB1F_ProfRowanAfterSpokenTo
     SetFlag FLAG_VEILSTONE_STORE_B1F_SPOKEN_TO_PROF_ROWAN
-    SetFlag FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN
+    SetFlag FLAG_HIDE_VEILSTONE_STORE_B1F_PROF_ROWAN
     Message VeilstoneStoreB1F_Text_RageCandyBarsAreTooPopular
     FacePlayer
     BufferPlayerName 0
@@ -267,7 +267,7 @@ VeilstoneStoreB1F_PoffinVendorCheckCaseIsFull:
 
 VeilstoneStoreB1F_PoffinVendorGivePoffin:
     GoToIfEq VAR_0x8005, 0, VeilstoneStoreB1F_PoffinVendorThankYou
-    GivePoffin VAR_RESULT, LOCALID_SPICINESS, LOCALID_DRYNESS, LOCALID_SWEETNESS, LOCALID_BITTERNESS, LOCALID_SOURNESS, LOCALID_SMOOTHNESS
+    GivePoffin VAR_RESULT, LOCAL_VAR_SPICINESS, LOCAL_VAR_DRYNESS, LOCAL_VAR_SWEETNESS, LOCAL_VAR_BITTERNESS, LOCAL_VAR_SOURNESS, LOCAL_VAR_SMOOTHNESS
     AddToGameRecord RECORD_MONEY_SPENT, 6400
     RemoveMoney2 6400
     SubVar VAR_0x8005, 1
@@ -310,83 +310,83 @@ VeilstoneStoreB1F_PoffinVendorClose2:
     End
 
 VeilstoneStoreB1F_PoffinVendorCreateSpicyDry:
-    SetVar LOCALID_SPICINESS, 32
-    SetVar LOCALID_DRYNESS, 32
-    SetVar LOCALID_SWEETNESS, 0
-    SetVar LOCALID_BITTERNESS, 0
-    SetVar LOCALID_SOURNESS, 0
+    SetVar LOCAL_VAR_SPICINESS, 32
+    SetVar LOCAL_VAR_DRYNESS, 32
+    SetVar LOCAL_VAR_SWEETNESS, 0
+    SetVar LOCAL_VAR_BITTERNESS, 0
+    SetVar LOCAL_VAR_SOURNESS, 0
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateSpicySweet:
-    SetVar LOCALID_SPICINESS, 32
-    SetVar LOCALID_DRYNESS, 0
-    SetVar LOCALID_SWEETNESS, 32
-    SetVar LOCALID_BITTERNESS, 0
-    SetVar LOCALID_SOURNESS, 0
+    SetVar LOCAL_VAR_SPICINESS, 32
+    SetVar LOCAL_VAR_DRYNESS, 0
+    SetVar LOCAL_VAR_SWEETNESS, 32
+    SetVar LOCAL_VAR_BITTERNESS, 0
+    SetVar LOCAL_VAR_SOURNESS, 0
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateSpicyBitter:
-    SetVar LOCALID_SPICINESS, 32
-    SetVar LOCALID_DRYNESS, 0
-    SetVar LOCALID_SWEETNESS, 0
-    SetVar LOCALID_BITTERNESS, 32
-    SetVar LOCALID_SOURNESS, 0
+    SetVar LOCAL_VAR_SPICINESS, 32
+    SetVar LOCAL_VAR_DRYNESS, 0
+    SetVar LOCAL_VAR_SWEETNESS, 0
+    SetVar LOCAL_VAR_BITTERNESS, 32
+    SetVar LOCAL_VAR_SOURNESS, 0
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateSpicySour:
-    SetVar LOCALID_SPICINESS, 32
-    SetVar LOCALID_DRYNESS, 0
-    SetVar LOCALID_SWEETNESS, 0
-    SetVar LOCALID_BITTERNESS, 0
-    SetVar LOCALID_SOURNESS, 32
+    SetVar LOCAL_VAR_SPICINESS, 32
+    SetVar LOCAL_VAR_DRYNESS, 0
+    SetVar LOCAL_VAR_SWEETNESS, 0
+    SetVar LOCAL_VAR_BITTERNESS, 0
+    SetVar LOCAL_VAR_SOURNESS, 32
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateDrySweet:
-    SetVar LOCALID_SPICINESS, 0
-    SetVar LOCALID_DRYNESS, 32
-    SetVar LOCALID_SWEETNESS, 32
-    SetVar LOCALID_BITTERNESS, 0
-    SetVar LOCALID_SOURNESS, 0
+    SetVar LOCAL_VAR_SPICINESS, 0
+    SetVar LOCAL_VAR_DRYNESS, 32
+    SetVar LOCAL_VAR_SWEETNESS, 32
+    SetVar LOCAL_VAR_BITTERNESS, 0
+    SetVar LOCAL_VAR_SOURNESS, 0
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateDryBitter:
-    SetVar LOCALID_SPICINESS, 0
-    SetVar LOCALID_DRYNESS, 32
-    SetVar LOCALID_SWEETNESS, 0
-    SetVar LOCALID_BITTERNESS, 32
-    SetVar LOCALID_SOURNESS, 0
+    SetVar LOCAL_VAR_SPICINESS, 0
+    SetVar LOCAL_VAR_DRYNESS, 32
+    SetVar LOCAL_VAR_SWEETNESS, 0
+    SetVar LOCAL_VAR_BITTERNESS, 32
+    SetVar LOCAL_VAR_SOURNESS, 0
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateDrySour:
-    SetVar LOCALID_SPICINESS, 0
-    SetVar LOCALID_DRYNESS, 32
-    SetVar LOCALID_SWEETNESS, 0
-    SetVar LOCALID_BITTERNESS, 0
-    SetVar LOCALID_SOURNESS, 32
+    SetVar LOCAL_VAR_SPICINESS, 0
+    SetVar LOCAL_VAR_DRYNESS, 32
+    SetVar LOCAL_VAR_SWEETNESS, 0
+    SetVar LOCAL_VAR_BITTERNESS, 0
+    SetVar LOCAL_VAR_SOURNESS, 32
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateSweetBitter:
-    SetVar LOCALID_SPICINESS, 0
-    SetVar LOCALID_DRYNESS, 0
-    SetVar LOCALID_SWEETNESS, 32
-    SetVar LOCALID_BITTERNESS, 32
-    SetVar LOCALID_SOURNESS, 0
+    SetVar LOCAL_VAR_SPICINESS, 0
+    SetVar LOCAL_VAR_DRYNESS, 0
+    SetVar LOCAL_VAR_SWEETNESS, 32
+    SetVar LOCAL_VAR_BITTERNESS, 32
+    SetVar LOCAL_VAR_SOURNESS, 0
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateSweetSour:
-    SetVar LOCALID_SPICINESS, 0
-    SetVar LOCALID_DRYNESS, 0
-    SetVar LOCALID_SWEETNESS, 32
-    SetVar LOCALID_BITTERNESS, 0
-    SetVar LOCALID_SOURNESS, 32
+    SetVar LOCAL_VAR_SPICINESS, 0
+    SetVar LOCAL_VAR_DRYNESS, 0
+    SetVar LOCAL_VAR_SWEETNESS, 32
+    SetVar LOCAL_VAR_BITTERNESS, 0
+    SetVar LOCAL_VAR_SOURNESS, 32
     Return
 
 VeilstoneStoreB1F_PoffinVendorCreateBitterSour:
-    SetVar LOCALID_SPICINESS, 0
-    SetVar LOCALID_DRYNESS, 0
-    SetVar LOCALID_SWEETNESS, 0
-    SetVar LOCALID_BITTERNESS, 32
-    SetVar LOCALID_SOURNESS, 32
+    SetVar LOCAL_VAR_SPICINESS, 0
+    SetVar LOCAL_VAR_DRYNESS, 0
+    SetVar LOCAL_VAR_SWEETNESS, 0
+    SetVar LOCAL_VAR_BITTERNESS, 32
+    SetVar LOCAL_VAR_SOURNESS, 32
     Return
 
 VeilstoneStoreB1F_PoffinVendorMenu:
diff --git a/res/field/scripts/scripts_veilstone_store_elevator.s b/res/field/scripts/scripts_veilstone_store_elevator.s
index 238d16b44f..0ff6849057 100644
--- a/res/field/scripts/scripts_veilstone_store_elevator.s
+++ b/res/field/scripts/scripts_veilstone_store_elevator.s
@@ -1,6 +1,7 @@
 #include "macros/scrcmd.inc"
 #include "res/text/bank/veilstone_store_elevator.h"
 #include "res/text/bank/menu_entries.h"
+#include "res/field/events/events_veilstone_store_elevator.h"
 
 
     ScriptEntry VeilstoneStoreElevator_TalkElevatorOperator
@@ -145,7 +146,7 @@ VeilstoneStoreElevator_GoingDownMessage:
 VeilstoneStoreElevator_ElevatorAnimation:
     SetVar VAR_ELEVATOR_FLOORS_ABOVE, -1
     CloseMessage
-    ApplyMovement 0, VeilstoneStoreElevator_LookDown
+    ApplyMovement LOCALID_RECEPTIONIST, VeilstoneStoreElevator_Movement_ReceptionistWalkOnSpotSouth
     WaitMovement
     WaitSE SEQ_SE_CONFIRM
     PlayElevatorAnimation VAR_0x8004, 4
@@ -216,6 +217,6 @@ VeilstoneStoreElevator_SelectNoFloor:
     End
 
     .balign 4, 0
-VeilstoneStoreElevator_LookDown:
+VeilstoneStoreElevator_Movement_ReceptionistWalkOnSpotSouth:
     WalkOnSpotNormalSouth
     EndMovement
diff --git a/res/text/footstep_house.json b/res/text/footstep_house.json
index 51d611704d..65afead9a6 100644
--- a/res/text/footstep_house.json
+++ b/res/text/footstep_house.json
@@ -2,7 +2,7 @@
   "key": 24307,
   "messages": [
     {
-      "id": "FootstepHouse_Text_PokemonAreQuiteEasyForMeToRead",
+      "id": "FootstepHouse_Text_PokemonEasyToRead",
       "en_US": [
         "Dr. Footstep: Pokémon are quite easy\n",
         "for me to read.\r",
@@ -18,7 +18,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_DoYouWantToCheckTheFeelingsOfYourPokemonAgain",
+      "id": "FootstepHouse_Text_CheckFeelingsAgain",
       "en_US": [
         "Dr. Footstep: Do you want to check\n",
         "the feelings of your Pokémon again?\r",
@@ -29,14 +29,14 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_AndThatsWhatYourPokemonThinksOfYou",
+      "id": "FootstepHouse_Text_ThatsWhatPokemonThinks",
       "en_US": [
         "Dr. Footstep: ...And that is what\n",
         "your {STRVAR_1 0, 0, 0} thinks of you."
       ]
     },
     {
-      "id": "FootstepHouse_Text_PokemonDoesntLeaveAnyFootprints",
+      "id": "FootstepHouse_Text_NoFootprints",
       "en_US": [
         "Dr. Footstep: ...Hmmm... {STRVAR_1 0, 0, 0}\n",
         "doesn’t leave any footprints.\r",
@@ -52,7 +52,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_AndThatsWhatYourPokemonThinksOfYou_CloseBond",
+      "id": "FootstepHouse_Text_ThatsWhatPokemonThinks_CloseBond",
       "en_US": [
         "Dr. Footstep: ...And that is what\n",
         "your {STRVAR_1 0, 0, 0} thinks of you.\r",
@@ -62,7 +62,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_PokemonDoesntLeaveAnyFootprints_CloseBond",
+      "id": "FootstepHouse_Text_NoFootprints_CloseBond",
       "en_US": [
         "Dr. Footstep: ...Hmmm... {STRVAR_1 0, 0, 0}\n",
         "doesn’t leave any footprints.\r",
@@ -91,14 +91,14 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_PlayerPutTheFootprintRibbonOnPokemon",
+      "id": "FootstepHouse_Text_PutRibbonOnPokemon",
       "en_US": [
         "{STRVAR_1 3, 1, 0} put the Footprint Ribbon\n",
         "on {STRVAR_1 0, 0, 0}."
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithPrint_Level1",
+      "id": "FootstepHouse_Text_Cute_WithPrint_Level1",
       "en_US": [
         "Aww... {STRVAR_1 3, 1, 0} only plays with\n",
         "other Pokémon...\r",
@@ -111,7 +111,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithPrint_Level2",
+      "id": "FootstepHouse_Text_Cute_WithPrint_Level2",
       "en_US": [
         "Others say there are people who\n",
         "aren’t very nice to Pokémon.\r",
@@ -124,7 +124,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithPrint_Level3",
+      "id": "FootstepHouse_Text_Cute_WithPrint_Level3",
       "en_US": [
         "This adventure with {STRVAR_1 3, 1, 0}\n",
         "is lots of fun.\r",
@@ -137,7 +137,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithPrint_Level4",
+      "id": "FootstepHouse_Text_Cute_WithPrint_Level4",
       "en_US": [
         "{STRVAR_1 1, 2, 0} and {STRVAR_1 3, 1, 0} make\n",
         "a perfectly matched combo!\r",
@@ -150,7 +150,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithPrint_Level5",
+      "id": "FootstepHouse_Text_Cute_WithPrint_Level5",
       "en_US": [
         "If I said there can be friendship\n",
         "between Pokémon and people, will\f",
@@ -162,7 +162,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithoutPrint_Level1",
+      "id": "FootstepHouse_Text_Cute_NoPrint_Level1",
       "en_US": [
         "{STRVAR_1 1, 2, 0} is bored...\n",
         "Play with me more, more...\r",
@@ -171,7 +171,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithoutPrint_Level2",
+      "id": "FootstepHouse_Text_Cute_NoPrint_Level2",
       "en_US": [
         "Gonna go with {STRVAR_1 3, 1, 0} all over\n",
         "the place...\r",
@@ -180,7 +180,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithoutPrint_Level3",
+      "id": "FootstepHouse_Text_Cute_NoPrint_Level3",
       "en_US": [
         "{STRVAR_1 1, 2, 0} get strong, make\n",
         "{STRVAR_1 3, 1, 0} happy.\r",
@@ -191,7 +191,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithoutPrint_Level4",
+      "id": "FootstepHouse_Text_Cute_NoPrint_Level4",
       "en_US": [
         "{STRVAR_1 1, 2, 0} and {STRVAR_1 3, 1, 0}\n",
         "make a friendly combo.\r",
@@ -202,7 +202,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_CuteType_WithoutPrint_Level5",
+      "id": "FootstepHouse_Text_Cute_NoPrint_Level5",
       "en_US": [
         "{STRVAR_1 3, 1, 0} makes {STRVAR_1 1, 2, 0}\n",
         "very proud!\r",
@@ -213,7 +213,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithPrint_Level1",
+      "id": "FootstepHouse_Text_Tough_WithPrint_Level1",
       "en_US": [
         "Why does {STRVAR_1 3, 1, 0} use only\n",
         "other Pokémon?\r",
@@ -225,7 +225,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithPrint_Level2",
+      "id": "FootstepHouse_Text_Tough_WithPrint_Level2",
       "en_US": [
         "Humans can’t understand the cries\n",
         "of Pokémon, nor our feelings.\r",
@@ -236,7 +236,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithPrint_Level3",
+      "id": "FootstepHouse_Text_Tough_WithPrint_Level3",
       "en_US": [
         "If a Pokémon were to travel alone,\n",
         "it would be limited as to where\f",
@@ -250,7 +250,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithPrint_Level4",
+      "id": "FootstepHouse_Text_Tough_WithPrint_Level4",
       "en_US": [
         "Some wild Pokémon frown upon others\n",
         "for traveling with humans.\r",
@@ -264,7 +264,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithPrint_Level5",
+      "id": "FootstepHouse_Text_Tough_WithPrint_Level5",
       "en_US": [
         "{STRVAR_1 3, 1, 0} is...\n",
         "A remarkable human and Trainer.\r",
@@ -277,7 +277,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithoutPrint_Level1",
+      "id": "FootstepHouse_Text_Tough_NoPrint_Level1",
       "en_US": [
         "Does {STRVAR_1 3, 1, 0} intend to ignore\n",
         "me forever?\r",
@@ -286,7 +286,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithoutPrint_Level2",
+      "id": "FootstepHouse_Text_Tough_NoPrint_Level2",
       "en_US": [
         "If a Pokémon is treated as a friend,\n",
         "it will return the sentiments.\r",
@@ -297,7 +297,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithoutPrint_Level3",
+      "id": "FootstepHouse_Text_Tough_NoPrint_Level3",
       "en_US": [
         "Did {STRVAR_1 1, 2, 0} get stronger?\n",
         "Who is responsible for making me so?\r",
@@ -306,7 +306,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithoutPrint_Level4",
+      "id": "FootstepHouse_Text_Tough_NoPrint_Level4",
       "en_US": [
         "{STRVAR_1 3, 1, 0} and {STRVAR_1 1, 2, 0} are\n",
         "alike in some ways.\r",
@@ -315,7 +315,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ToughType_WithoutPrint_Level5",
+      "id": "FootstepHouse_Text_Tough_NoPrint_Level5",
       "en_US": [
         "{STRVAR_1 3, 1, 0} is very impressive,\n",
         "especially for a human.\r",
@@ -326,7 +326,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithPrint_Level1",
+      "id": "FootstepHouse_Text_Scary_WithPrint_Level1",
       "en_US": [
         "That {STRVAR_1 3, 1, 0}...\n",
         "What is that Trainer thinking?\r",
@@ -339,7 +339,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithPrint_Level2",
+      "id": "FootstepHouse_Text_Scary_WithPrint_Level2",
       "en_US": [
         "I have little understanding of\n",
         "{STRVAR_1 3, 1, 0} as a human...\r",
@@ -351,7 +351,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithPrint_Level3",
+      "id": "FootstepHouse_Text_Scary_WithPrint_Level3",
       "en_US": [
         "Our kind prefers to lurk in dark\n",
         "and dank places...\r",
@@ -363,7 +363,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithPrint_Level4",
+      "id": "FootstepHouse_Text_Scary_WithPrint_Level4",
       "en_US": [
         "Not for a moment did I think I would\n",
         "be traveling with a human...\r",
@@ -373,7 +373,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithPrint_Level5",
+      "id": "FootstepHouse_Text_Scary_WithPrint_Level5",
       "en_US": [
         "That {STRVAR_1 3, 1, 0} is the most\n",
         "impressive of humans.\r",
@@ -386,7 +386,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithoutPrint_Level1",
+      "id": "FootstepHouse_Text_Scary_NoPrint_Level1",
       "en_US": [
         "Wooooooh...\n",
         "{STRVAR_1 1, 2, 0} has nothing to do...\r",
@@ -395,7 +395,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithoutPrint_Level2",
+      "id": "FootstepHouse_Text_Scary_NoPrint_Level2",
       "en_US": [
         "Is there any human that would grow\n",
         "to like us {STRVAR_1 0, 0, 0}?\r",
@@ -406,7 +406,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithoutPrint_Level3",
+      "id": "FootstepHouse_Text_Scary_NoPrint_Level3",
       "en_US": [
         "{STRVAR_1 3, 1, 0} treats me, {STRVAR_1 1, 2, 0},\n",
         "nicely without being scared.\r",
@@ -416,7 +416,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithoutPrint_Level4",
+      "id": "FootstepHouse_Text_Scary_NoPrint_Level4",
       "en_US": [
         "{STRVAR_1 1, 2, 0} is starting to forget\n",
         "a little about being in the wild...\r",
@@ -425,7 +425,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_ScaryType_WithoutPrint_Level5",
+      "id": "FootstepHouse_Text_Scary_NoPrint_Level5",
       "en_US": [
         "There are no Pokémon that dislike\n",
         "humans...\r",
@@ -437,7 +437,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithoutPrint_Level1",
+      "id": "FootstepHouse_Text_Slow_NoPrint_Level1",
       "en_US": [
         "Hnurrrr... Hunh?\n",
         "This is... Where?\r",
@@ -449,7 +449,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithoutPrint_Level2",
+      "id": "FootstepHouse_Text_Slow_NoPrint_Level2",
       "en_US": [
         "Hnurrr... Me? Uhm...\n",
         "I like to sleep most the time.\f",
@@ -464,7 +464,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithoutPrint_Level3",
+      "id": "FootstepHouse_Text_Slow_NoPrint_Level3",
       "en_US": [
         "Hnurrr... Me? Uhm...\n",
         "There are lots of kinds of moves.\r",
@@ -478,7 +478,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithoutPrint_Level4",
+      "id": "FootstepHouse_Text_Slow_NoPrint_Level4",
       "en_US": [
         "Hnurrr... I don’t know how to begin\n",
         "saying this...\r",
@@ -493,7 +493,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithoutPrint_Level5",
+      "id": "FootstepHouse_Text_Slow_NoPrint_Level5",
       "en_US": [
         "Hnurrr... Me? Uhm...\n",
         "Other Pokémon, they say to me...\r",
@@ -507,7 +507,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithPrint_Level1",
+      "id": "FootstepHouse_Text_Slow_WithPrint_Level1",
       "en_US": [
         "Hnurrr... I did not know that?\n",
         "I really don’t? What is this?\f",
@@ -516,7 +516,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithPrint_Level2",
+      "id": "FootstepHouse_Text_Slow_WithPrint_Level2",
       "en_US": [
         "Hnurrr... Well, I...\n",
         "I think I’m motivated.\f",
@@ -526,7 +526,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithPrint_Level3",
+      "id": "FootstepHouse_Text_Slow_WithPrint_Level3",
       "en_US": [
         "Hnurrr... How should I say this?\n",
         "We both look out for each other.\f",
@@ -536,7 +536,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithPrint_Level4",
+      "id": "FootstepHouse_Text_Slow_WithPrint_Level4",
       "en_US": [
         "Hnurrr... How do I say?\n",
         "How should I describe us?\r",
@@ -548,7 +548,7 @@
       ]
     },
     {
-      "id": "FootstepHouse_Text_SlowType_WithPrint_Level5",
+      "id": "FootstepHouse_Text_Slow_WithPrint_Level5",
       "en_US": [
         "Hnurrr...\n",
         "What is left to say, I say?\r",
diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json
index 88fa734b55..751f749bd4 100644
--- a/res/text/menu_entries.json
+++ b/res/text/menu_entries.json
@@ -178,7 +178,7 @@
       "en_US": "EXIT"
     },
     {
-      "id": "pl_msg_00000361_00044",
+      "id": "MenuEntries_Text_Fossil_Cancel",
       "en_US": "CANCEL"
     },
     {
@@ -650,31 +650,31 @@
       "en_US": "TELL ME AGAIN"
     },
     {
-      "id": "pl_msg_00000361_00156",
+      "id": "MenuEntries_Text_Fossil_OldAmber",
       "en_US": "OLD AMBER"
     },
     {
-      "id": "pl_msg_00000361_00157",
+      "id": "MenuEntries_Text_Fossil_Helix",
       "en_US": "HELIX FOSSIL"
     },
     {
-      "id": "pl_msg_00000361_00158",
+      "id": "MenuEntries_Text_Fossil_Dome",
       "en_US": "DOME FOSSIL"
     },
     {
-      "id": "pl_msg_00000361_00159",
+      "id": "MenuEntries_Text_Fossil_Root",
       "en_US": "ROOT FOSSIL"
     },
     {
-      "id": "pl_msg_00000361_00160",
+      "id": "MenuEntries_Text_Fossil_Claw",
       "en_US": "CLAW FOSSIL"
     },
     {
-      "id": "pl_msg_00000361_00161",
+      "id": "MenuEntries_Text_Fossil_Armor",
       "en_US": "ARMOR FOSSIL"
     },
     {
-      "id": "pl_msg_00000361_00162",
+      "id": "MenuEntries_Text_Fossil_Skull",
       "en_US": "SKULL FOSSIL"
     },
     {
diff --git a/res/text/mining_museum.json b/res/text/mining_museum.json
index a921dc2939..15d643ed08 100644
--- a/res/text/mining_museum.json
+++ b/res/text/mining_museum.json
@@ -2,7 +2,7 @@
   "key": 25643,
   "messages": [
     {
-      "id": "MiningMuseum_Text_Welcome",
+      "id": "MiningMuseum_Text_WelcomeToMuseum",
       "en_US": [
         "Hello! Welcome to the Oreburgh\n",
         "Mining Museum!"
@@ -18,14 +18,14 @@
       ]
     },
     {
-      "id": "MiningMuseum_Text_HaveFossilForMe",
+      "id": "MiningMuseum_Text_ShallIReviveFossil",
       "en_US": [
         "You have a Fossil for me, yes?\n",
         "Shall I turn it into a Pokémon?"
       ]
     },
     {
-      "id": "MiningMuseum_Text_WhichFossilToRevive",
+      "id": "MiningMuseum_Text_ReviveWhichFossil",
       "en_US": [
         "Which Fossil should I turn back\n",
         "into a Pokémon? Choose! Now!"
@@ -55,7 +55,7 @@
       ]
     },
     {
-      "id": "MiningMuseum_Text_PokemonRevivedTooLong",
+      "id": "MiningMuseum_Text_ThisIsRevivedPokemon",
       "en_US": [
         "You were gone too long!\n",
         "You kept us waiting! Unacceptable!\r",
@@ -64,7 +64,7 @@
       ]
     },
     {
-      "id": "MiningMuseum_Text_PokemonReceived",
+      "id": "MiningMuseum_Text_ReceivedPokemon",
       "en_US": [
         "{STRVAR_1 3, 0, 0} received\n",
         "the {STRVAR_1 0, 1, 0}!\r"
@@ -185,14 +185,14 @@
       ]
     },
     {
-      "id": "MiningMuseum_Text_CoalSamplesDisplay",
+      "id": "MiningMuseum_Text_SamplesDifferentRegions",
       "en_US": [
         "Samples of coal from different regions\n",
         "are displayed."
       ]
     },
     {
-      "id": "MiningMuseum_Text_CoalSamplesBox",
+      "id": "MiningMuseum_Text_CategorizedCoalSamples",
       "en_US": [
         "The box contains categorized samples\n",
         "of coal."
diff --git a/res/text/rotoms_room.json b/res/text/rotoms_room.json
index 730bd88dca..9715f132ee 100644
--- a/res/text/rotoms_room.json
+++ b/res/text/rotoms_room.json
@@ -2,7 +2,7 @@
   "key": 5131,
   "messages": [
     {
-      "id": "RotomsRoom_Text_PokemonEnteredMotorTryingToLearnMove",
+      "id": "RotomsRoom_Text_TryingToLearnMove",
       "en_US": [
         "{STRVAR_1 0, 0, 0} entered the motor.\r",
         "{STRVAR_1 0, 0, 0} is trying to\n",
@@ -21,7 +21,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_PokemonDidNotLearnMoveEmergedFromTheMotor",
+      "id": "RotomsRoom_Text_DidNotLearnMoveEmergedFromMotor",
       "en_US": [
         "{STRVAR_1 0, 0, 0} did not learn\n",
         "{STRVAR_1 6, 1, 0}.\r",
@@ -40,7 +40,7 @@
       "en_US": "1,{PAUSE 20} 2,{PAUSE 20} and...{PAUSE 20} ...{PAUSE 20} Poof!"
     },
     {
-      "id": "RotomsRoom_Text_PokemonForgotHowToUseMove",
+      "id": "RotomsRoom_Text_PokemonForgotMove",
       "en_US": [
         "{STRVAR_1 1, 0, 0} forgot how to\n",
         "use {STRVAR_1 6, 1, 0}.\r",
@@ -55,15 +55,15 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_WhichRotomAreYouChoosing",
+      "id": "RotomsRoom_Text_ChooseWhichRotom",
       "en_US": "Which ROTOM are you choosing?\r"
     },
     {
-      "id": "RotomsRoom_Text_AnEggCantEnterAMotor",
+      "id": "RotomsRoom_Text_EggCantEnter",
       "en_US": "An Egg can’t enter a motor."
     },
     {
-      "id": "RotomsRoom_Text_ThatPokemonCantEnterAMotor",
+      "id": "RotomsRoom_Text_ThatPokemonCantEnter",
       "en_US": "That Pokémon can’t enter a motor."
     },
     {
@@ -75,11 +75,11 @@
       "en_US": "{STRVAR_1 0, 0, 0} emerged from the motor.\r"
     },
     {
-      "id": "RotomsRoom_Text_00012",
+      "id": "RotomsRoom_Text_Dummy12",
       "garbage": 24
     },
     {
-      "id": "RotomsRoom_Text_OhRotomWantsToRevertToItsOriginalForm",
+      "id": "RotomsRoom_Text_RevertRotomToOriginalForm",
       "en_US": [
         "Oh? ROTOM appears as if it wants to\n",
         "revert to its original form.\r",
@@ -100,7 +100,7 @@
       "en_US": "NO"
     },
     {
-      "id": "RotomsRoom_Text_ThatRotomHasntEnteredAMotor",
+      "id": "RotomsRoom_Text_RotomHasntEnteredMotor",
       "en_US": "That ROTOM hasn’t entered a motor."
     },
     {
@@ -111,14 +111,14 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_ItsAMicrowaveOven",
+      "id": "RotomsRoom_Text_ItsAMicrowave",
       "en_US": [
         "It’s a microwave oven.\n",
         "It has an odd-shaped motor on it."
       ]
     },
     {
-      "id": "RotomsRoom_Text_ItsAMicrowaveOvenRotomWantsToGoIntoTheMotor",
+      "id": "RotomsRoom_Text_AllowRotomEnterMicrowave",
       "en_US": [
         "It’s a microwave oven.\n",
         "It has an odd-shaped motor on it.\r",
@@ -128,7 +128,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_RotomGaveUpEnteringTheMicrowaveOvensMotor",
+      "id": "RotomsRoom_Text_RotomGaveUpEnteringMicrowave",
       "en_US": [
         "ROTOM reluctantly gave up on entering\n",
         "the microwave oven’s motor..."
@@ -142,7 +142,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_ItsARefrigeratorRotomWantsToGoIntoTheMotor",
+      "id": "RotomsRoom_Text_AllowRotomEnterRefrigerator",
       "en_US": [
         "It’s a refrigerator.\n",
         "It has an odd-shaped motor on it.\r",
@@ -152,7 +152,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_RotomGaveUpEnteringTheRefrigeratorsMotor",
+      "id": "RotomsRoom_Text_RotomGaveUpEnteringRefrigerator",
       "en_US": [
         "ROTOM reluctantly gave up on entering\n",
         "the refrigerator’s motor..."
@@ -166,7 +166,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_ItsAWashingMachineRotomWantsToGoIntoTheMotor",
+      "id": "RotomsRoom_Text_AllowRotomEnterWashingMachine",
       "en_US": [
         "It’s a washing machine.\n",
         "It has an odd-shaped motor on it.\r",
@@ -176,21 +176,21 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_RotomGaveUpEnteringTheWashingMachinesMotor",
+      "id": "RotomsRoom_Text_RotomGaveUpEnteringWashingMachine",
       "en_US": [
         "ROTOM reluctantly gave up on entering\n",
         "the washing machine’s motor..."
       ]
     },
     {
-      "id": "RotomsRoom_Text_ItsARotaryFan",
+      "id": "RotomsRoom_Text_ItsAFan",
       "en_US": [
         "It’s a rotary fan.\n",
         "It has an odd-shaped motor on it."
       ]
     },
     {
-      "id": "RotomsRoom_Text_ItsARotaryFanRotomWantsToGoIntoTheMotor",
+      "id": "RotomsRoom_Text_AllowRotomEnterFan",
       "en_US": [
         "It’s a rotary fan.\n",
         "It has an odd-shaped motor on it.\r",
@@ -200,7 +200,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_RotomGaveUpEnteringTheRotaryFansMotor",
+      "id": "RotomsRoom_Text_RotomGaveUpEnteringFan",
       "en_US": [
         "ROTOM reluctantly gave up on entering\n",
         "the rotary fan’s motor..."
@@ -214,7 +214,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_ItsALawnMowerRotomWantsToGoIntoTheMotor",
+      "id": "RotomsRoom_Text_AllowRotomEnterLawnMower",
       "en_US": [
         "It’s a lawn mower.\n",
         "It has an odd-shaped motor on it.\r",
@@ -224,14 +224,14 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_RotomGaveUpEnteringTheLawnMowersMotor",
+      "id": "RotomsRoom_Text_RotomGaveUpEnteringLawnMower",
       "en_US": [
         "ROTOM reluctantly gave up on entering\n",
         "the lawn mower’s motor..."
       ]
     },
     {
-      "id": "RotomsRoom_Text_ThereIsAMysteriousNotebookHere",
+      "id": "RotomsRoom_Text_InformationAboutRotom",
       "en_US": [
         "There is a mysterious notebook here.\n",
         "Its age is impossible to tell.\r",
@@ -257,7 +257,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_RowanAhImagineFindingYouHere",
+      "id": "RotomsRoom_Text_ImagineFindingYouHere",
       "en_US": [
         "Rowan: Ah, imagine finding you here!\r",
         "You must be eager to fill your Pokédex\n",
@@ -270,7 +270,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_APokemonThatSlipsIntoElectricAppliancesYouSay",
+      "id": "RotomsRoom_Text_PokemonThatSlipsIntoAppliances",
       "en_US": [
         "A Pokémon that slips into electric\n",
         "appliances, you say...\r",
@@ -290,7 +290,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_AnywayThisRotomWhatAnInterestingPokemon",
+      "id": "RotomsRoom_Text_RotomInterestingPokemon",
       "en_US": [
         "Anyway, this ROTOM...\n",
         "What an interesting Pokémon.\r",
@@ -310,7 +310,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_ItsAnOldNotebook",
+      "id": "RotomsRoom_Text_ReadOldNotebook",
       "en_US": [
         "It’s an old notebook.\n",
         "There’s no telling how old it is.\r",
@@ -318,7 +318,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_OurEncounterWasASuddenOne",
+      "id": "RotomsRoom_Text_PokemonEmergedFromLawnMower",
       "en_US": [
         "“Our encounter was a sudden one.\r",
         "“It was when I found my toy robot,\n",
@@ -331,7 +331,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_ThePokemonHoveredInTheAir",
+      "id": "RotomsRoom_Text_PokemonHoveredInTheAir",
       "en_US": [
         "“The Pokémon hovered in the air, held\n",
         "aloft by a power unseen.\r",
@@ -349,7 +349,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_ThePokemonOnlyWishedToBeFriends",
+      "id": "RotomsRoom_Text_INameThisRotom",
       "en_US": [
         "“Finally, I came to realize that the\n",
         "Pokémon only wished to be friends.\r",
@@ -363,7 +363,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_RotomIsAPokemonThatIsSensational",
+      "id": "RotomsRoom_Text_AbilityToEnterMachinery",
       "en_US": [
         "“ROTOM is a Pokémon that is simply\n",
         "sensational.\r",
@@ -376,7 +376,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_RotomAndIBecameFastFriends",
+      "id": "RotomsRoom_Text_RotomAndIBecameFriends",
       "en_US": [
         "“ROTOM and I became fast friends.\n",
         "We were perpetual companions.\r",
@@ -390,7 +390,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_AFeelingOfMischiefGotTheBetterOfMe",
+      "id": "RotomsRoom_Text_FeelingOfMischief",
       "en_US": [
         "“A feeling of mischief got the better\n",
         "of me one day.\r",
@@ -404,7 +404,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_WhenICameToRotomDisappeared",
+      "id": "RotomsRoom_Text_RotomDisappeared",
       "en_US": [
         "“When I came to, to my horror I\n",
         "realized that ROTOM had disappeared.\r",
@@ -419,7 +419,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_MySearchForRotomCarriedMeFarFromHome",
+      "id": "RotomsRoom_Text_SearchForRotom",
       "en_US": [
         "“My search for ROTOM carried me far\n",
         "from home.\r",
@@ -435,7 +435,7 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_TheRobotEyesLitUpHappilyAsIHeldIt",
+      "id": "RotomsRoom_Text_NotebookEnds",
       "en_US": [
         "“The robot’s eyes lit up happily as\n",
         "I held it.\r",
@@ -449,35 +449,35 @@
       ]
     },
     {
-      "id": "RotomsRoom_Text_00048",
+      "id": "RotomsRoom_Text_Dummy48",
       "garbage": 14
     },
     {
-      "id": "RotomsRoom_Text_00049",
+      "id": "RotomsRoom_Text_Dummy49",
       "garbage": 14
     },
     {
-      "id": "RotomsRoom_Text_00050",
+      "id": "RotomsRoom_Text_Dummy50",
       "garbage": 14
     },
     {
-      "id": "RotomsRoom_Text_00051",
+      "id": "RotomsRoom_Text_Dummy51",
       "garbage": 14
     },
     {
-      "id": "RotomsRoom_Text_00052",
+      "id": "RotomsRoom_Text_Dummy52",
       "garbage": 14
     },
     {
-      "id": "RotomsRoom_Text_00053",
+      "id": "RotomsRoom_Text_Dummy53",
       "garbage": 20
     },
     {
-      "id": "RotomsRoom_Text_00054",
+      "id": "RotomsRoom_Text_Dummy54",
       "garbage": 2
     },
     {
-      "id": "RotomsRoom_Text_00055",
+      "id": "RotomsRoom_Text_Dummy55",
       "garbage": 3
     }
   ]
diff --git a/res/text/veilstone_store_2f.json b/res/text/veilstone_store_2f.json
index 14ebf81bef..1defb7523f 100644
--- a/res/text/veilstone_store_2f.json
+++ b/res/text/veilstone_store_2f.json
@@ -9,7 +9,7 @@
       ]
     },
     {
-      "id": "VeilstoneStore2F_Text_MayIHelpYouPersonalized",
+      "id": "VeilstoneStore2F_Text_PlayerMayIHelpYou",
       "en_US": [
         "Hello, {STRVAR_1 3, 0, 0}.\n",
         "May I help you with anything?"
@@ -48,7 +48,7 @@
       ]
     },
     {
-      "id": "VeilstoneStore2F_Text_MatchingDressesForMeAndMyPokemon",
+      "id": "VeilstoneStore2F_Text_MatchingDresses",
       "en_US": [
         "Where can I find matching dresses for\n",
         "myself and my dear Pokémon?"
diff --git a/res/text/veilstone_store_3f.json b/res/text/veilstone_store_3f.json
index a21e46fa2d..833c9734b2 100644
--- a/res/text/veilstone_store_3f.json
+++ b/res/text/veilstone_store_3f.json
@@ -9,7 +9,7 @@
       ]
     },
     {
-      "id": "VeilstoneStore3F_Text_MayIHelpYouPersonalized",
+      "id": "VeilstoneStore3F_Text_PlayerMayIHelpYou",
       "en_US": [
         "Hello, {STRVAR_1 3, 0, 0}.\n",
         "May I help you with anything?"
@@ -20,7 +20,7 @@
       "en_US": "Please enjoy yourself."
     },
     {
-      "id": "VeilstoneStore3F_Text_FalseSwipeMakesPokemonEasierToCatch",
+      "id": "VeilstoneStore3F_Text_FalseSwipeMakesCatchingEasier",
       "en_US": [
         "False Swipe makes wild Pokémon easier\n",
         "to catch.\r",
@@ -29,14 +29,14 @@
       ]
     },
     {
-      "id": "VeilstoneStore3F_Text_ForFireTypesSuggestFireBlast",
+      "id": "VeilstoneStore3F_Text_FireBlastForFireTypes",
       "en_US": [
         "For Fire-type Pokémon, may I suggest\n",
         "Fire Blast?"
       ]
     },
     {
-      "id": "VeilstoneStore3F_Text_ProtectIsForDodgingAttacks",
+      "id": "VeilstoneStore3F_Text_ProtectForDodgingAttacks",
       "en_US": [
         "The move Protect is the perfect\n",
         "solution for dodging attacks.\r",
@@ -72,7 +72,7 @@
       ]
     },
     {
-      "id": "VeilstoneStore3F_Text_WouldLoveToBuyAllTheMerchandise",
+      "id": "VeilstoneStore3F_Text_WantToBuyAllMerchandise",
       "en_US": [
         "I would love to buy up all the\n",
         "merchandise here.\r",
diff --git a/res/text/veilstone_store_4f.json b/res/text/veilstone_store_4f.json
index b662e02866..20f4e38382 100644
--- a/res/text/veilstone_store_4f.json
+++ b/res/text/veilstone_store_4f.json
@@ -9,7 +9,7 @@
       ]
     },
     {
-      "id": "VeilstoneStore4F_Text_MayIHelpYouPersonalized",
+      "id": "VeilstoneStore4F_Text_PlayerMayIHelpYou",
       "en_US": [
         "Hello, {STRVAR_1 3, 0, 0}.\n",
         "May I help you with anything?"
@@ -20,35 +20,35 @@
       "en_US": "Please enjoy yourself."
     },
     {
-      "id": "VeilstoneStore4F_Text_YellowCushionIsSoftAndFirm",
+      "id": "VeilstoneStore4F_Text_YellowCushionIsPopular",
       "en_US": [
         "The Yellow Cushion is popular for its\n",
         "perfect balance of soft and firm."
       ]
     },
     {
-      "id": "VeilstoneStore4F_Text_SurprisedHowManyBuyCupboards",
+      "id": "VeilstoneStore4F_Text_ManyBuyCupboards",
       "en_US": [
         "You would be surprised at how many\n",
         "customers buy Cupboards."
       ]
     },
     {
-      "id": "VeilstoneStore4F_Text_BuizelDollIsVeryPopular",
+      "id": "VeilstoneStore4F_Text_BuizelDollVeryPopular",
       "en_US": [
         "The BUIZEL Doll is very popular due\n",
         "to its nautical image."
       ]
     },
     {
-      "id": "VeilstoneStore4F_Text_MantykeDollHasBeenHotSeller",
+      "id": "VeilstoneStore4F_Text_MantykeDollHotSeller",
       "en_US": [
         "Let me think... The MANTYKE Doll has\n",
         "been a hot seller recently."
       ]
     },
     {
-      "id": "VeilstoneStore4F_Text_ChuckAQuickBallOrTimerBall",
+      "id": "VeilstoneStore4F_Text_QuickBallOrTimerBall",
       "en_US": [
         "If you encounter a wild Pokémon,\n",
         "chuck a Quick Ball right off the bat!\r",
@@ -57,14 +57,14 @@
       ]
     },
     {
-      "id": "VeilstoneStore4F_Text_ThatBoySaysHeIsTrainingHisImage",
+      "id": "VeilstoneStore4F_Text_BoyIsTrainingHisImage",
       "en_US": [
         "That boy doesn’t have any Pokémon,\n",
         "but he says he’s training his image!"
       ]
     },
     {
-      "id": "VeilstoneStore4F_Text_NeedAnotherCopyOfGameToChallengePapa",
+      "id": "VeilstoneStore4F_Text_NeedAnotherCopyOfGame",
       "en_US": [
         "We need another copy of the game so I\n",
         "can challenge my papa!"
diff --git a/res/text/veilstone_store_5f.json b/res/text/veilstone_store_5f.json
index aa2a561f0f..0c0636804b 100644
--- a/res/text/veilstone_store_5f.json
+++ b/res/text/veilstone_store_5f.json
@@ -17,7 +17,7 @@
       ]
     },
     {
-      "id": "VeilstoneStore5F_Text_AGiftOfThisStickyBarb",
+      "id": "VeilstoneStore5F_Text_GiftThisStickyBarb",
       "en_US": [
         "Ah, young Pokémon Trainer...\r",
         "As your senior in life, let me make\n",
@@ -25,7 +25,7 @@
       ]
     },
     {
-      "id": "VeilstoneStore5F_Text_SticksToTheFoeAndInflictsDamage",
+      "id": "VeilstoneStore5F_Text_SticksToFoeInflictsDamage",
       "en_US": [
         "That Sticky Barb is a hold item.\n",
         "If the Pokémon holding it is hit...\r",
diff --git a/res/text/veilstone_store_b1f.json b/res/text/veilstone_store_b1f.json
index 9cb4c5460f..8fc40a1a5c 100644
--- a/res/text/veilstone_store_b1f.json
+++ b/res/text/veilstone_store_b1f.json
@@ -21,7 +21,7 @@
       ]
     },
     {
-      "id": "VeilstoneStoreB1F_Text_IBoughtAllTheRageCandyBars",
+      "id": "VeilstoneStoreB1F_Text_BoughtAllRageCandyBars",
       "en_US": [
         "I didn’t expect to find paradise in the\n",
         "department store’s basement.\r",
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "id": "VeilstoneStoreB1F_Text_FlavorsOfPoffinsAffectConditionOfPokemon",
+      "id": "VeilstoneStoreB1F_Text_FlavorsAffectCondition",
       "en_US": [
         "Pay attention, please.\r",
         "The flavors of Poffins affect the\n",
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index ce9e840e22..2b62a6d7b4 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -586,24 +586,24 @@ BOOL ScrCmd_2F1(ScriptContext *param0)
 
 BOOL ScrCmd_GetPartyRotomCountAndFirst(ScriptContext *ctx)
 {
-    int partyCount, i, count;
+    int partyCount;
     FieldSystem *fieldSystem = ctx->fieldSystem;
     u16 *destVarCount = ScriptContext_GetVarPointer(ctx);
     u16 *destVarPartySlot = ScriptContext_GetVarPointer(ctx);
 
-    count = 0;
-    *destVarPartySlot = 0xff;
+    int count = 0;
+    *destVarPartySlot = PARTY_SLOT_NONE;
     Party *party = SaveData_GetParty(fieldSystem->saveData);
     partyCount = Party_GetCurrentCount(party);
 
-    for (i = 0; i < partyCount; i++) {
+    for (int i = 0; i < partyCount; i++) {
         Pokemon *mon = Party_GetPokemonBySlotIndex(party, i);
         u32 species = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL);
         u32 form = Pokemon_GetValue(mon, MON_DATA_FORM, NULL);
         u32 isEgg = Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL);
 
         if (species == SPECIES_ROTOM && form != ROTOM_FORM_BASE && isEgg == FALSE) {
-            if (*destVarPartySlot == 0xff) {
+            if (*destVarPartySlot == PARTY_SLOT_NONE) {
                 *destVarPartySlot = i;
             }
 
@@ -612,7 +612,7 @@ BOOL ScrCmd_GetPartyRotomCountAndFirst(ScriptContext *ctx)
     }
 
     *destVarCount = count;
-    return 0;
+    return FALSE;
 }
 
 BOOL ScrCmd_SetRotomForm(ScriptContext *ctx)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index ee2348d145..70d8a03563 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -489,7 +489,7 @@ static BOOL ScrCmd_HealParty(ScriptContext *ctx);
 static BOOL ScrCmd_Dummy14F(ScriptContext *ctx);
 static BOOL ScrCmd_EndCommunication(ScriptContext *ctx);
 static BOOL ScriptContext_WaitForCommManIsDeleted(ScriptContext *ctx);
-static BOOL ScrCmd_151(ScriptContext *ctx);
+static BOOL ScrCmd_FieldCommEnterBattleRoom(ScriptContext *ctx);
 static BOOL ScrCmd_SetCommPlayerDir(ScriptContext *ctx);
 static BOOL ScrCmd_SetObjectEventPos(ScriptContext *ctx);
 static BOOL ScrCmd_SetPosition(ScriptContext *ctx);
@@ -4544,7 +4544,7 @@ static BOOL ScrCmd_2BB(ScriptContext *ctx)
     return TRUE;
 }
 
-static BOOL ScrCmd_151(ScriptContext *ctx)
+static BOOL ScrCmd_FieldCommEnterBattleRoom(ScriptContext *ctx)
 {
     FieldCommMan_EnterBattleRoom(ctx->fieldSystem);
     return FALSE;