fix map events names

2019-04-18 11:03:10 -04:00
parent f5683b5c46
commit 799e971efe
427 changed files with 1700 additions and 1700 deletions
@@ -1,7 +1,7 @@
 BirthIsland_Exterior:: @ 83505A8
    .4byte BirthIsland_Exterior_Layout @ 0x8348380
-    .4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C
+    .4byte BirthIsland_Exterior_MapEvents @ 0x83B4C1C
-    .4byte gMapScripts_BirthIsland_Exterior @ 0x8165203
+    .4byte BirthIsland_Exterior_MapScripts @ 0x8165203
    .4byte NULL
    .2byte 0xFFFF
    .2byte 342
@@ -1,7 +1,7 @@
 BirthIsland_Harbor:: @ 83505E0
    .4byte Island_Harbor_Layout @ 0x8343FB8
-    .4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24
+    .4byte BirthIsland_Harbor_MapEvents @ 0x83B4D24
-    .4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6
+    .4byte BirthIsland_Harbor_MapScripts @ 0x81653E6
    .4byte NULL
    .2byte 0xFFFF
    .2byte 315
@@ -1,7 +1,7 @@
 CeladonCity:: @ 83506C0
    .4byte CeladonCity_Layout @ 0x82E2818
-    .4byte gMapEvents_CeladonCity @ 0x83B5898
+    .4byte CeladonCity_MapEvents @ 0x83B5898
-    .4byte gMapScripts_CeladonCity @ 0x8166C8F
+    .4byte CeladonCity_MapScripts @ 0x8166C8F
    .4byte CeladonCity_MapConnections @ 0x835285C
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 84
@@ -1,7 +1,7 @@
 CeladonCity_Condominiums_1F:: @ 83512AC
    .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC
-    .4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538
+    .4byte CeladonCity_Condominiums_1F_MapEvents @ 0x83BB538
-    .4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320
+    .4byte CeladonCity_Condominiums_1F_MapScripts @ 0x816C320
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 184
@@ -1,7 +1,7 @@
 CeladonCity_Condominiums_2F:: @ 83512C8
    .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58
-    .4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4
+    .4byte CeladonCity_Condominiums_2F_MapEvents @ 0x83BB5B4
-    .4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0
+    .4byte CeladonCity_Condominiums_2F_MapScripts @ 0x816C3D0
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 185
@@ -1,7 +1,7 @@
 CeladonCity_Condominiums_3F:: @ 83512E4
    .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4
-    .4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8
+    .4byte CeladonCity_Condominiums_3F_MapEvents @ 0x83BB6A8
-    .4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA
+    .4byte CeladonCity_Condominiums_3F_MapScripts @ 0x816C3DA
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 186
@@ -1,7 +1,7 @@
 CeladonCity_Condominiums_Roof:: @ 8351300
    .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C
-    .4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC
+    .4byte CeladonCity_Condominiums_Roof_MapEvents @ 0x83BB6EC
-    .4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459
+    .4byte CeladonCity_Condominiums_Roof_MapScripts @ 0x816C459
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 187
@@ -1,7 +1,7 @@
 CeladonCity_Condominiums_RoofRoom:: @ 835131C
    .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054
-    .4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C
+    .4byte CeladonCity_Condominiums_RoofRoom_MapEvents @ 0x83BB76C
-    .4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463
+    .4byte CeladonCity_Condominiums_RoofRoom_MapScripts @ 0x816C463
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 188
@@ -1,7 +1,7 @@
 CeladonCity_DepartmentStore_1F:: @ 83511E8
    .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC
-    .4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC
+    .4byte CeladonCity_DepartmentStore_1F_MapEvents @ 0x83BB0EC
-    .4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8
+    .4byte CeladonCity_DepartmentStore_1F_MapScripts @ 0x816BAD8
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 192
@@ -1,7 +1,7 @@
 CeladonCity_DepartmentStore_2F:: @ 8351204
    .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8
-    .4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184
+    .4byte CeladonCity_DepartmentStore_2F_MapEvents @ 0x83BB184
-    .4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4
+    .4byte CeladonCity_DepartmentStore_2F_MapScripts @ 0x816BAF4
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 193
@@ -1,7 +1,7 @@
 CeladonCity_DepartmentStore_3F:: @ 8351220
    .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954
-    .4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC
+    .4byte CeladonCity_DepartmentStore_3F_MapEvents @ 0x83BB2AC
-    .4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84
+    .4byte CeladonCity_DepartmentStore_3F_MapScripts @ 0x816BB84
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 194
@@ -1,7 +1,7 @@
 CeladonCity_DepartmentStore_4F:: @ 835123C
    .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00
-    .4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C
+    .4byte CeladonCity_DepartmentStore_4F_MapEvents @ 0x83BB32C
-    .4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE
+    .4byte CeladonCity_DepartmentStore_4F_MapScripts @ 0x816BBEE
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 195
@@ -1,7 +1,7 @@
 CeladonCity_DepartmentStore_5F:: @ 8351258
    .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC
-    .4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4
+    .4byte CeladonCity_DepartmentStore_5F_MapEvents @ 0x83BB3C4
-    .4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40
+    .4byte CeladonCity_DepartmentStore_5F_MapScripts @ 0x816BC40
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 196
@@ -1,7 +1,7 @@
 CeladonCity_DepartmentStore_Elevator:: @ 8351290
    .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70
-    .4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C
+    .4byte CeladonCity_DepartmentStore_Elevator_MapEvents @ 0x83BB47C
-    .4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152
+    .4byte CeladonCity_DepartmentStore_Elevator_MapScripts @ 0x816C152
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 179
@@ -1,7 +1,7 @@
 CeladonCity_DepartmentStore_Roof:: @ 8351274
    .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4
-    .4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440
+    .4byte CeladonCity_DepartmentStore_Roof_MapEvents @ 0x83BB440
-    .4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC
+    .4byte CeladonCity_DepartmentStore_Roof_MapScripts @ 0x816BCCC
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 197
@@ -1,7 +1,7 @@
 CeladonCity_GameCorner:: @ 8351370
    .4byte CeladonCity_GameCorner_Layout @ 0x82D7168
-    .4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78
+    .4byte CeladonCity_GameCorner_MapEvents @ 0x83BBB78
-    .4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646
+    .4byte CeladonCity_GameCorner_MapScripts @ 0x816C646
    .4byte NULL
    .2byte BGM_FRLG_GAMECORNER
    .2byte 27
@@ -1,7 +1,7 @@
 CeladonCity_GameCorner_PrizeRoom:: @ 835138C
    .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C
-    .4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C
+    .4byte CeladonCity_GameCorner_PrizeRoom_MapEvents @ 0x83BBC1C
-    .4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75
+    .4byte CeladonCity_GameCorner_PrizeRoom_MapScripts @ 0x816CB75
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 189
@@ -1,7 +1,7 @@
 CeladonCity_Gym:: @ 83513A8
    .4byte CeladonCity_Gym_Layout @ 0x82D6370
-    .4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68
+    .4byte CeladonCity_Gym_MapEvents @ 0x83BBD68
-    .4byte gMapScripts_CeladonCity_Gym @ 0x816D060
+    .4byte CeladonCity_Gym_MapScripts @ 0x816D060
    .4byte NULL
    .2byte BGM_FRLG_GYM
    .2byte 15
@@ -1,7 +1,7 @@
 CeladonCity_Hotel:: @ 83513FC
    .4byte CeladonCity_Hotel_Layout @ 0x831B438
-    .4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C
+    .4byte CeladonCity_Hotel_MapEvents @ 0x83BBF0C
-    .4byte gMapScripts_CeladonCity_Hotel @ 0x816D283
+    .4byte CeladonCity_Hotel_MapScripts @ 0x816D283
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 191
@@ -1,7 +1,7 @@
 CeladonCity_House1:: @ 83513E0
    .4byte House5_Layout @ 0x82D6AF0
-    .4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80
+    .4byte CeladonCity_House1_MapEvents @ 0x83BBE80
-    .4byte gMapScripts_CeladonCity_House1 @ 0x816D267
+    .4byte CeladonCity_House1_MapScripts @ 0x816D267
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 21
@@ -1,7 +1,7 @@
 CeladonCity_PokemonCenter_1F:: @ 8351338
    .4byte PokemonCenter_1F_Layout @ 0x82D5990
-    .4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800
+    .4byte CeladonCity_PokemonCenter_1F_MapEvents @ 0x83BB800
-    .4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC
+    .4byte CeladonCity_PokemonCenter_1F_MapScripts @ 0x816C5EC
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 8
@@ -1,7 +1,7 @@
 CeladonCity_PokemonCenter_2F:: @ 8351354
    .4byte PokemonCenter_2F_Layout @ 0x82D5AE0
-    .4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C
+    .4byte CeladonCity_PokemonCenter_2F_MapEvents @ 0x83BB88C
-    .4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F
+    .4byte CeladonCity_PokemonCenter_2F_MapScripts @ 0x816C61F
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 9
@@ -1,7 +1,7 @@
 CeladonCity_Restaurant:: @ 83513C4
    .4byte CeladonCity_Restaurant_Layout @ 0x831B29C
-    .4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C
+    .4byte CeladonCity_Restaurant_MapEvents @ 0x83BBE0C
-    .4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA
+    .4byte CeladonCity_Restaurant_MapScripts @ 0x816D1EA
    .4byte NULL
    .2byte BGM_FRLG_CELADON_CITY
    .2byte 190
@@ -1,7 +1,7 @@
 CeruleanCave_1F:: @ 834F9F4
    .4byte CeruleanCave_1F_Layout @ 0x8311318
-    .4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC
+    .4byte CeruleanCave_1F_MapEvents @ 0x83B15BC
-    .4byte gMapScripts_CeruleanCave_1F @ 0x81624B3
+    .4byte CeruleanCave_1F_MapScripts @ 0x81624B3
    .4byte NULL
    .2byte BGM_FRLG_ROCKET_HIDEOUT
    .2byte 151
@@ -1,7 +1,7 @@
 CeruleanCave_2F:: @ 834FA10
    .4byte CeruleanCave_2F_Layout @ 0x8311A6C
-    .4byte gMapEvents_CeruleanCave_2F @ 0x83B1738
+    .4byte CeruleanCave_2F_MapEvents @ 0x83B1738
-    .4byte gMapScripts_CeruleanCave_2F @ 0x81624BD
+    .4byte CeruleanCave_2F_MapScripts @ 0x81624BD
    .4byte NULL
    .2byte BGM_FRLG_ROCKET_HIDEOUT
    .2byte 152
@@ -1,7 +1,7 @@
 CeruleanCave_B1F:: @ 834FA2C
    .4byte CeruleanCave_B1F_Layout @ 0x83121C0
-    .4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874
+    .4byte CeruleanCave_B1F_MapEvents @ 0x83B1874
-    .4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE
+    .4byte CeruleanCave_B1F_MapScripts @ 0x81624BE
    .4byte NULL
    .2byte BGM_FRLG_ROCKET_HIDEOUT
    .2byte 153
@@ -1,7 +1,7 @@
 CeruleanCity:: @ 835066C
    .4byte CeruleanCity_Layout @ 0x82E022C
-    .4byte gMapEvents_CeruleanCity @ 0x83B53E0
+    .4byte CeruleanCity_MapEvents @ 0x83B53E0
-    .4byte gMapScripts_CeruleanCity @ 0x8166471
+    .4byte CeruleanCity_MapScripts @ 0x8166471
    .4byte CeruleanCity_MapConnections @ 0x83527F0
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 81
@@ -1,7 +1,7 @@
 CeruleanCity_BikeShop:: @ 8350FF0
    .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28
-    .4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC
+    .4byte CeruleanCity_BikeShop_MapEvents @ 0x83BA6FC
-    .4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC
+    .4byte CeruleanCity_BikeShop_MapScripts @ 0x816ABBC
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 26
@@ -1,7 +1,7 @@
 CeruleanCity_Gym:: @ 8350FD4
    .4byte CeruleanCity_Gym_Layout @ 0x82D5F84
-    .4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628
+    .4byte CeruleanCity_Gym_MapEvents @ 0x83BA628
-    .4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0
+    .4byte CeruleanCity_Gym_MapScripts @ 0x816AAA0
    .4byte NULL
    .2byte BGM_FRLG_GYM
    .2byte 12
@@ -1,7 +1,7 @@
 CeruleanCity_House1:: @ 8350F48
    .4byte CeruleanCity_House1_Layout @ 0x831A560
-    .4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350
+    .4byte CeruleanCity_House1_MapEvents @ 0x83BA350
-    .4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF
+    .4byte CeruleanCity_House1_MapScripts @ 0x816A7EF
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 183
@@ -1,7 +1,7 @@
 CeruleanCity_House2:: @ 8350F64
    .4byte CeruleanCity_House2_Layout @ 0x831A474
-    .4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0
+    .4byte CeruleanCity_House2_MapEvents @ 0x83BA3C0
-    .4byte gMapScripts_CeruleanCity_House2 @ 0x816A975
+    .4byte CeruleanCity_House2_MapScripts @ 0x816A975
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 182
@@ -1,7 +1,7 @@
 CeruleanCity_House3:: @ 8350F80
    .4byte House1_Layout @ 0x82D5754
-    .4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C
+    .4byte CeruleanCity_House3_MapEvents @ 0x83BA41C
-    .4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7
+    .4byte CeruleanCity_House3_MapScripts @ 0x816A9A7
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 6
@@ -1,7 +1,7 @@
 CeruleanCity_House4:: @ 8351028
    .4byte House1_Layout @ 0x82D5754
-    .4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4
+    .4byte CeruleanCity_House4_MapEvents @ 0x83BA7A4
-    .4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE
+    .4byte CeruleanCity_House4_MapScripts @ 0x816ACEE
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 6
@@ -1,7 +1,7 @@
 CeruleanCity_House5:: @ 8351044
    .4byte CeruleanCity_House5_Layout @ 0x8343540
-    .4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4
+    .4byte CeruleanCity_House5_MapEvents @ 0x83BA7E4
-    .4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F
+    .4byte CeruleanCity_House5_MapScripts @ 0x816AE4F
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 308
@@ -1,7 +1,7 @@
 CeruleanCity_Mart:: @ 835100C
    .4byte Mart_Layout @ 0x82D5BCC
-    .4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770
+    .4byte CeruleanCity_Mart_MapEvents @ 0x83BA770
-    .4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D
+    .4byte CeruleanCity_Mart_MapScripts @ 0x816AC9D
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 10
@@ -1,7 +1,7 @@
 CeruleanCity_PokemonCenter_1F:: @ 8350F9C
    .4byte PokemonCenter_1F_Layout @ 0x82D5990
-    .4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8
+    .4byte CeruleanCity_PokemonCenter_1F_MapEvents @ 0x83BA4F8
-    .4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D
+    .4byte CeruleanCity_PokemonCenter_1F_MapScripts @ 0x816AA2D
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 8
@@ -1,7 +1,7 @@
 CeruleanCity_PokemonCenter_2F:: @ 8350FB8
    .4byte PokemonCenter_2F_Layout @ 0x82D5AE0
-    .4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584
+    .4byte CeruleanCity_PokemonCenter_2F_MapEvents @ 0x83BA584
-    .4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79
+    .4byte CeruleanCity_PokemonCenter_2F_MapScripts @ 0x816AA79
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 9
@@ -1,7 +1,7 @@
 CinnabarIsland:: @ 83506F8
    .4byte CinnabarIsland_Layout @ 0x82E3B20
-    .4byte gMapEvents_CinnabarIsland @ 0x83B5BF0
+    .4byte CinnabarIsland_MapEvents @ 0x83B5BF0
-    .4byte gMapScripts_CinnabarIsland @ 0x8166ED6
+    .4byte CinnabarIsland_MapScripts @ 0x8166ED6
    .4byte CinnabarIsland_MapConnections @ 0x83528A8
    .2byte BGM_FRLG_CINNABAR_ISLAND
    .2byte 86
@@ -1,7 +1,7 @@
 CinnabarIsland_Gym:: @ 8351530
    .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8
-    .4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C
+    .4byte CinnabarIsland_Gym_MapEvents @ 0x83BC62C
-    .4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B
+    .4byte CinnabarIsland_Gym_MapScripts @ 0x816D94B
    .4byte NULL
    .2byte BGM_FRLG_GYM
    .2byte 36
@@ -1,7 +1,7 @@
 CinnabarIsland_Mart:: @ 83515F4
    .4byte Mart_Layout @ 0x82D5BCC
-    .4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8
+    .4byte CinnabarIsland_Mart_MapEvents @ 0x83BC9A8
-    .4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F
+    .4byte CinnabarIsland_Mart_MapScripts @ 0x816EA0F
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 10
@@ -1,7 +1,7 @@
 CinnabarIsland_PokemonCenter_1F:: @ 83515BC
    .4byte PokemonCenter_1F_Layout @ 0x82D5990
-    .4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8
+    .4byte CinnabarIsland_PokemonCenter_1F_MapEvents @ 0x83BC8A8
-    .4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7
+    .4byte CinnabarIsland_PokemonCenter_1F_MapScripts @ 0x816E8D7
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 8
@@ -1,7 +1,7 @@
 CinnabarIsland_PokemonCenter_2F:: @ 83515D8
    .4byte PokemonCenter_2F_Layout @ 0x82D5AE0
-    .4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934
+    .4byte CinnabarIsland_PokemonCenter_2F_MapEvents @ 0x83BC934
-    .4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8
+    .4byte CinnabarIsland_PokemonCenter_2F_MapScripts @ 0x816E9E8
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 9
@@ -1,7 +1,7 @@
 CinnabarIsland_PokemonLab_Entrance:: @ 835154C
    .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804
-    .4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8
+    .4byte CinnabarIsland_PokemonLab_Entrance_MapEvents @ 0x83BC6B8
-    .4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273
+    .4byte CinnabarIsland_PokemonLab_Entrance_MapScripts @ 0x816E273
    .4byte NULL
    .2byte BGM_FRLG_CINNABAR_ISLAND
    .2byte 203
@@ -1,7 +1,7 @@
 CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0
    .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54
-    .4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC
+    .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents @ 0x83BC7CC
-    .4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400
+    .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts @ 0x816E400
    .4byte NULL
    .2byte BGM_FRLG_CINNABAR_ISLAND
    .2byte 206
@@ -1,7 +1,7 @@
 CinnabarIsland_PokemonLab_Lounge:: @ 8351568
    .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974
-    .4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C
+    .4byte CinnabarIsland_PokemonLab_Lounge_MapEvents @ 0x83BC71C
-    .4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8
+    .4byte CinnabarIsland_PokemonLab_Lounge_MapScripts @ 0x816E2B8
    .4byte NULL
    .2byte BGM_FRLG_CINNABAR_ISLAND
    .2byte 204
@@ -1,7 +1,7 @@
 CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584
    .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4
-    .4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780
+    .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapEvents @ 0x83BC780
-    .4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE
+    .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapScripts @ 0x816E3DE
    .4byte NULL
    .2byte BGM_FRLG_CINNABAR_ISLAND
    .2byte 205
@@ -1,7 +1,7 @@
 DiglettsCave_B1F:: @ 834F620
    .4byte DiglettsCave_B1F_Layout @ 0x8303B68
-    .4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490
+    .4byte DiglettsCave_B1F_MapEvents @ 0x83AF490
-    .4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1
+    .4byte DiglettsCave_B1F_MapScripts @ 0x8160EF1
    .4byte NULL
    .2byte BGM_FRLG_VIRIDIAN_FOREST
    .2byte 124
@@ -1,7 +1,7 @@
 DiglettsCave_NorthEntrance:: @ 834F604
    .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94
-    .4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C
+    .4byte DiglettsCave_NorthEntrance_MapEvents @ 0x83AF46C
-    .4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7
+    .4byte DiglettsCave_NorthEntrance_MapScripts @ 0x8160EE7
    .4byte NULL
    .2byte BGM_FRLG_VIRIDIAN_FOREST
    .2byte 210
@@ -1,7 +1,7 @@
 DiglettsCave_SouthEntrance:: @ 834F63C
    .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58
-    .4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC
+    .4byte DiglettsCave_SouthEntrance_MapEvents @ 0x83AF4CC
-    .4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB
+    .4byte DiglettsCave_SouthEntrance_MapScripts @ 0x8160EFB
    .4byte NULL
    .2byte BGM_FRLG_VIRIDIAN_FOREST
    .2byte 211
@@ -1,7 +1,7 @@
 FiveIsland:: @ 83507D8
    .4byte FiveIsland_Layout @ 0x8323964
-    .4byte gMapEvents_FiveIsland @ 0x83B64F4
+    .4byte FiveIsland_MapEvents @ 0x83B64F4
-    .4byte gMapScripts_FiveIsland @ 0x8167E8E
+    .4byte FiveIsland_MapScripts @ 0x8167E8E
    .4byte FiveIsland_MapConnections @ 0x83529A0
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 234
@@ -1,7 +1,7 @@
 FiveIsland_Harbor:: @ 8351E7C
    .4byte Island_Harbor_Layout @ 0x8343FB8
-    .4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4
+    .4byte FiveIsland_Harbor_MapEvents @ 0x83BEFB4
-    .4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42
+    .4byte FiveIsland_Harbor_MapScripts @ 0x8171D42
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 315
@@ -1,7 +1,7 @@
 FiveIsland_House1:: @ 8351E98
    .4byte House3_Layout @ 0x82D5CB8
-    .4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8
+    .4byte FiveIsland_House1_MapEvents @ 0x83BEFE8
-    .4byte gMapScripts_FiveIsland_House1 @ 0x8171D56
+    .4byte FiveIsland_House1_MapScripts @ 0x8171D56
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 11
@@ -1,7 +1,7 @@
 FiveIsland_House2:: @ 8351EB4
    .4byte House3_Layout @ 0x82D5CB8
-    .4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C
+    .4byte FiveIsland_House2_MapEvents @ 0x83BF01C
-    .4byte gMapScripts_FiveIsland_House2 @ 0x8171D60
+    .4byte FiveIsland_House2_MapScripts @ 0x8171D60
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 11
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Entrance:: @ 83500D8
    .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8
-    .4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354
+    .4byte FiveIsland_LostCave_Entrance_MapEvents @ 0x83B4354
-    .4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC
+    .4byte FiveIsland_LostCave_Entrance_MapScripts @ 0x8164BEC
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 320
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room1:: @ 83500F4
    .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0
-    .4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8
+    .4byte FiveIsland_LostCave_Room1_MapEvents @ 0x83B43A8
-    .4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6
+    .4byte FiveIsland_LostCave_Room1_MapScripts @ 0x8164BF6
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 321
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room10:: @ 83501F0
    .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8
-    .4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC
+    .4byte FiveIsland_LostCave_Room10_MapEvents @ 0x83B45AC
-    .4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D
+    .4byte FiveIsland_LostCave_Room10_MapScripts @ 0x8164C2D
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 330
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room11:: @ 835020C
    .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0
-    .4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0
+    .4byte FiveIsland_LostCave_Room11_MapEvents @ 0x83B45E0
-    .4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB
+    .4byte FiveIsland_LostCave_Room11_MapScripts @ 0x8164CCB
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 331
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room12:: @ 8350228
    .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8
-    .4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614
+    .4byte FiveIsland_LostCave_Room12_MapEvents @ 0x83B4614
-    .4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC
+    .4byte FiveIsland_LostCave_Room12_MapScripts @ 0x8164CCC
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 332
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room13:: @ 8350244
    .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310
-    .4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648
+    .4byte FiveIsland_LostCave_Room13_MapEvents @ 0x83B4648
-    .4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD
+    .4byte FiveIsland_LostCave_Room13_MapScripts @ 0x8164CCD
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 333
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room14:: @ 8350260
    .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428
-    .4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C
+    .4byte FiveIsland_LostCave_Room14_MapEvents @ 0x83B467C
-    .4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE
+    .4byte FiveIsland_LostCave_Room14_MapScripts @ 0x8164CCE
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 334
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room2:: @ 8350110
    .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708
-    .4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC
+    .4byte FiveIsland_LostCave_Room2_MapEvents @ 0x83B43DC
-    .4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E
+    .4byte FiveIsland_LostCave_Room2_MapScripts @ 0x8164C0E
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 322
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room3:: @ 835012C
    .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820
-    .4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410
+    .4byte FiveIsland_LostCave_Room3_MapEvents @ 0x83B4410
-    .4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F
+    .4byte FiveIsland_LostCave_Room3_MapScripts @ 0x8164C0F
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 323
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room4:: @ 8350148
    .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938
-    .4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C
+    .4byte FiveIsland_LostCave_Room4_MapEvents @ 0x83B445C
-    .4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10
+    .4byte FiveIsland_LostCave_Room4_MapScripts @ 0x8164C10
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 324
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room5:: @ 8350164
    .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50
-    .4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490
+    .4byte FiveIsland_LostCave_Room5_MapEvents @ 0x83B4490
-    .4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28
+    .4byte FiveIsland_LostCave_Room5_MapScripts @ 0x8164C28
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 325
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room6:: @ 8350180
    .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68
-    .4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4
+    .4byte FiveIsland_LostCave_Room6_MapEvents @ 0x83B44C4
-    .4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29
+    .4byte FiveIsland_LostCave_Room6_MapScripts @ 0x8164C29
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 326
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room7:: @ 835019C
    .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80
-    .4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8
+    .4byte FiveIsland_LostCave_Room7_MapEvents @ 0x83B44F8
-    .4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A
+    .4byte FiveIsland_LostCave_Room7_MapScripts @ 0x8164C2A
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 327
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room8:: @ 83501B8
    .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98
-    .4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C
+    .4byte FiveIsland_LostCave_Room8_MapEvents @ 0x83B452C
-    .4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B
+    .4byte FiveIsland_LostCave_Room8_MapScripts @ 0x8164C2B
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 328
@@ -1,7 +1,7 @@
 FiveIsland_LostCave_Room9:: @ 83501D4
    .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0
-    .4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560
+    .4byte FiveIsland_LostCave_Room9_MapEvents @ 0x83B4560
-    .4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C
+    .4byte FiveIsland_LostCave_Room9_MapScripts @ 0x8164C2C
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 329
@@ -1,7 +1,7 @@
 FiveIsland_Meadow:: @ 8350C38
    .4byte FiveIsland_Meadow_Layout @ 0x832BAE4
-    .4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94
+    .4byte FiveIsland_Meadow_MapEvents @ 0x83B8D94
-    .4byte gMapScripts_FiveIsland_Meadow @ 0x8168932
+    .4byte FiveIsland_Meadow_MapScripts @ 0x8168932
    .4byte FiveIsland_Meadow_MapConnections @ 0x8352DF4
    .2byte BGM_FRLG_SEVII_ISLANDS
    .2byte 248
@@ -1,7 +1,7 @@
 FiveIsland_MemorialPillar:: @ 8350C54
    .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648
-    .4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C
+    .4byte FiveIsland_MemorialPillar_MapEvents @ 0x83B8E5C
-    .4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2
+    .4byte FiveIsland_MemorialPillar_MapScripts @ 0x81689D2
    .4byte FiveIsland_MemorialPillar_MapConnections @ 0x8352E08
    .2byte BGM_FRLG_SEVII_ISLANDS
    .2byte 249
@@ -1,7 +1,7 @@
 FiveIsland_PokemonCenter_1F:: @ 8351E44
    .4byte PokemonCenter_1F_Layout @ 0x82D5990
-    .4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC
+    .4byte FiveIsland_PokemonCenter_1F_MapEvents @ 0x83BEEDC
-    .4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1
+    .4byte FiveIsland_PokemonCenter_1F_MapScripts @ 0x8171CF1
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 8
@@ -1,7 +1,7 @@
 FiveIsland_PokemonCenter_2F:: @ 8351E60
    .4byte PokemonCenter_2F_Layout @ 0x82D5AE0
-    .4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68
+    .4byte FiveIsland_PokemonCenter_2F_MapEvents @ 0x83BEF68
-    .4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B
+    .4byte FiveIsland_PokemonCenter_2F_MapScripts @ 0x8171D1B
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 9
@@ -1,7 +1,7 @@
 FiveIsland_ResortGorgeous:: @ 8350C00
    .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC
-    .4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80
+    .4byte FiveIsland_ResortGorgeous_MapEvents @ 0x83B8C80
-    .4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4
+    .4byte FiveIsland_ResortGorgeous_MapScripts @ 0x81687E4
    .4byte FiveIsland_ResortGorgeous_MapConnections @ 0x8352DB4
    .2byte BGM_FRLG_SEVII_ISLANDS
    .2byte 246
@@ -1,7 +1,7 @@
 FiveIsland_ResortGorgeous_House:: @ 8351F78
    .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C
-    .4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0
+    .4byte FiveIsland_ResortGorgeous_House_MapEvents @ 0x83BF2C0
-    .4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD
+    .4byte FiveIsland_ResortGorgeous_House_MapScripts @ 0x8171EBD
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 17
@@ -1,7 +1,7 @@
 FiveIsland_WaterLabyrinth:: @ 8350C1C
    .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340
-    .4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4
+    .4byte FiveIsland_WaterLabyrinth_MapEvents @ 0x83B8CC4
-    .4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D
+    .4byte FiveIsland_WaterLabyrinth_MapScripts @ 0x816884D
    .4byte FiveIsland_WaterLabyrinth_MapConnections @ 0x8352DD4
    .2byte BGM_FRLG_SEVII_ISLANDS
    .2byte 247
@@ -1,7 +1,7 @@
 FourIsland:: @ 83507BC
    .4byte FourIsland_Layout @ 0x8323580
-    .4byte gMapEvents_FourIsland @ 0x83B646C
+    .4byte FourIsland_MapEvents @ 0x83B646C
-    .4byte gMapScripts_FourIsland @ 0x8167CAE
+    .4byte FourIsland_MapScripts @ 0x8167CAE
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 233
@@ -1,7 +1,7 @@
 FourIsland_Harbor:: @ 8351DF0
    .4byte Island_Harbor_Layout @ 0x8343FB8
-    .4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8
+    .4byte FourIsland_Harbor_MapEvents @ 0x83BEDA8
-    .4byte gMapScripts_FourIsland_Harbor @ 0x8171C98
+    .4byte FourIsland_Harbor_MapScripts @ 0x8171C98
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 315
@@ -1,7 +1,7 @@
 FourIsland_House1:: @ 8351DB8
    .4byte House3_Layout @ 0x82D5CB8
-    .4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8
+    .4byte FourIsland_House1_MapEvents @ 0x83BEBD8
-    .4byte gMapScripts_FourIsland_House1 @ 0x8171C44
+    .4byte FourIsland_House1_MapScripts @ 0x8171C44
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 11
@@ -1,7 +1,7 @@
 FourIsland_House2:: @ 8351E0C
    .4byte House3_Layout @ 0x82D5CB8
-    .4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC
+    .4byte FourIsland_House2_MapEvents @ 0x83BEDDC
-    .4byte gMapScripts_FourIsland_House2 @ 0x8171CAC
+    .4byte FourIsland_House2_MapScripts @ 0x8171CAC
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 11
@@ -1,7 +1,7 @@
 FourIsland_IcefallCave_1F:: @ 834FE38
    .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C
-    .4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC
+    .4byte FourIsland_IcefallCave_1F_MapEvents @ 0x83B34AC
-    .4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44
+    .4byte FourIsland_IcefallCave_1F_MapScripts @ 0x8163D44
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 294
@@ -1,7 +1,7 @@
 FourIsland_IcefallCave_Entrance:: @ 834FE1C
    .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38
-    .4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438
+    .4byte FourIsland_IcefallCave_Entrance_MapEvents @ 0x83B3438
-    .4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A
+    .4byte FourIsland_IcefallCave_Entrance_MapScripts @ 0x8163D3A
    .4byte NULL
    .2byte BGM_FRLG_MT_EMBER
    .2byte 293
@@ -1,7 +1,7 @@
 FourIsland_LoreleisHouse:: @ 8351DD4
    .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418
-    .4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C
+    .4byte FourIsland_LoreleisHouse_MapEvents @ 0x83BED5C
-    .4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E
+    .4byte FourIsland_LoreleisHouse_MapScripts @ 0x8171C4E
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 30
@@ -1,7 +1,7 @@
 FourIsland_Mart:: @ 8351E28
    .4byte Mart_Layout @ 0x82D5BCC
-    .4byte gMapEvents_FourIsland_Mart @ 0x83BEE40
+    .4byte FourIsland_Mart_MapEvents @ 0x83BEE40
-    .4byte gMapScripts_FourIsland_Mart @ 0x8171CAD
+    .4byte FourIsland_Mart_MapScripts @ 0x8171CAD
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 10
@@ -1,7 +1,7 @@
 FourIsland_PokemonCenter_1F:: @ 8351D80
    .4byte PokemonCenter_1F_Layout @ 0x82D5990
-    .4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00
+    .4byte FourIsland_PokemonCenter_1F_MapEvents @ 0x83BEB00
-    .4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA
+    .4byte FourIsland_PokemonCenter_1F_MapScripts @ 0x8171BEA
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 8
@@ -1,7 +1,7 @@
 FourIsland_PokemonCenter_2F:: @ 8351D9C
    .4byte PokemonCenter_2F_Layout @ 0x82D5AE0
-    .4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C
+    .4byte FourIsland_PokemonCenter_2F_MapEvents @ 0x83BEB8C
-    .4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D
+    .4byte FourIsland_PokemonCenter_2F_MapScripts @ 0x8171C1D
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 9
@@ -1,7 +1,7 @@
 FourIsland_PokemonDayCare:: @ 8351D64
    .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8
-    .4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64
+    .4byte FourIsland_PokemonDayCare_MapEvents @ 0x83BEA64
-    .4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F
+    .4byte FourIsland_PokemonDayCare_MapScripts @ 0x817193F
    .4byte NULL
    .2byte BGM_FRLG_ISLAND_FOUR
    .2byte 277
@@ -1,7 +1,7 @@
 FuchsiaCity:: @ 83506DC
    .4byte FuchsiaCity_Layout @ 0x82E373C
-    .4byte gMapEvents_FuchsiaCity @ 0x83B5B14
+    .4byte FuchsiaCity_MapEvents @ 0x83B5B14
-    .4byte gMapScripts_FuchsiaCity @ 0x8166D75
+    .4byte FuchsiaCity_MapScripts @ 0x8166D75
    .4byte FuchsiaCity_MapConnections @ 0x8352888
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 85
@@ -1,7 +1,7 @@
 FuchsiaCity_Building1:: @ 83514DC
    .4byte FuchsiaCity_Building1_Layout @ 0x831C48C
-    .4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4
+    .4byte FuchsiaCity_Building1_MapEvents @ 0x83BC3F4
-    .4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B
+    .4byte FuchsiaCity_Building1_MapScripts @ 0x816D74B
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 201
@@ -1,7 +1,7 @@
 FuchsiaCity_Gym:: @ 835146C
    .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04
-    .4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4
+    .4byte FuchsiaCity_Gym_MapEvents @ 0x83BC1A4
-    .4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D
+    .4byte FuchsiaCity_Gym_MapScripts @ 0x816D54D
    .4byte NULL
    .2byte BGM_FRLG_GYM
    .2byte 20
@@ -1,7 +1,7 @@
 FuchsiaCity_House1:: @ 8351488
    .4byte House1_Layout @ 0x82D5754
-    .4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218
+    .4byte FuchsiaCity_House1_MapEvents @ 0x83BC218
-    .4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5
+    .4byte FuchsiaCity_House1_MapScripts @ 0x816D6C5
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 6
@@ -1,7 +1,7 @@
 FuchsiaCity_House2:: @ 83514F8
    .4byte FuchsiaCity_House2_Layout @ 0x831C578
-    .4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440
+    .4byte FuchsiaCity_House2_MapEvents @ 0x83BC440
-    .4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816
+    .4byte FuchsiaCity_House2_MapScripts @ 0x816D816
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 202
@@ -1,7 +1,7 @@
 FuchsiaCity_House3:: @ 8351514
    .4byte House1_Layout @ 0x82D5754
-    .4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474
+    .4byte FuchsiaCity_House3_MapEvents @ 0x83BC474
-    .4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894
+    .4byte FuchsiaCity_House3_MapScripts @ 0x816D894
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 6
@@ -1,7 +1,7 @@
 FuchsiaCity_Mart:: @ 8351434
    .4byte Mart_Layout @ 0x82D5BCC
-    .4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014
+    .4byte FuchsiaCity_Mart_MapEvents @ 0x83BC014
-    .4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0
+    .4byte FuchsiaCity_Mart_MapScripts @ 0x816D4E0
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 10
@@ -1,7 +1,7 @@
 FuchsiaCity_PokemonCenter_1F:: @ 83514A4
    .4byte PokemonCenter_1F_Layout @ 0x82D5990
-    .4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC
+    .4byte FuchsiaCity_PokemonCenter_1F_MapEvents @ 0x83BC2AC
-    .4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1
+    .4byte FuchsiaCity_PokemonCenter_1F_MapScripts @ 0x816D6F1
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 8
@@ -1,7 +1,7 @@
 FuchsiaCity_PokemonCenter_2F:: @ 83514C0
    .4byte PokemonCenter_2F_Layout @ 0x82D5AE0
-    .4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338
+    .4byte FuchsiaCity_PokemonCenter_2F_MapEvents @ 0x83BC338
-    .4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724
+    .4byte FuchsiaCity_PokemonCenter_2F_MapScripts @ 0x816D724
    .4byte NULL
    .2byte BGM_FRLG_POKEMON_CENTER
    .2byte 9
@@ -1,7 +1,7 @@
 FuchsiaCity_SafariZone_Entrance:: @ 8351418
    .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80
-    .4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0
+    .4byte FuchsiaCity_SafariZone_Entrance_MapEvents @ 0x83BBFA0
-    .4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8
+    .4byte FuchsiaCity_SafariZone_Entrance_MapScripts @ 0x816D2A8
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 51
@@ -1,7 +1,7 @@
 FuchsiaCity_ZooBuilding:: @ 8351450
    .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348
-    .4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0
+    .4byte FuchsiaCity_ZooBuilding_MapEvents @ 0x83BC0A0
-    .4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528
+    .4byte FuchsiaCity_ZooBuilding_MapScripts @ 0x816D528
    .4byte NULL
    .2byte BGM_FRLG_CERULEAN_CITY
    .2byte 200
@@ -1,7 +1,7 @@
 IndigoPlateau_Exterior:: @ 8350714
    .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04
-    .4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C
+    .4byte IndigoPlateau_Exterior_MapEvents @ 0x83B5C3C
-    .4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B
+    .4byte IndigoPlateau_Exterior_MapScripts @ 0x816723B
    .4byte IndigoPlateau_Exterior_MapConnections @ 0x83528BC
    .2byte BGM_FRLG_INDIGO_PLATEAU
    .2byte 87
--- a/Show More
+++ b/Show More