diff options
Diffstat (limited to 'data/maps')
425 files changed, 850 insertions, 850 deletions
diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 5bcc49c74..2634948be 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -1,7 +1,7 @@ BirthIsland_Exterior:: @ 83505A8 .4byte BirthIsland_Exterior_Layout @ 0x8348380 - .4byte gMapEvents_BirthIsland_Exterior @ 0x83B4C1C - .4byte gMapScripts_BirthIsland_Exterior @ 0x8165203 + .4byte BirthIsland_Exterior_MapEvents @ 0x83B4C1C + .4byte BirthIsland_Exterior_MapScripts @ 0x8165203 .4byte NULL .2byte 0xFFFF .2byte 342 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index a082ac025..68253d8df 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -1,7 +1,7 @@ BirthIsland_Harbor:: @ 83505E0 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_BirthIsland_Harbor @ 0x83B4D24 - .4byte gMapScripts_BirthIsland_Harbor @ 0x81653E6 + .4byte BirthIsland_Harbor_MapEvents @ 0x83B4D24 + .4byte BirthIsland_Harbor_MapScripts @ 0x81653E6 .4byte NULL .2byte 0xFFFF .2byte 315 diff --git a/data/maps/CeladonCity/header.inc b/data/maps/CeladonCity/header.inc index 146c03ab2..2ec3fc62c 100644 --- a/data/maps/CeladonCity/header.inc +++ b/data/maps/CeladonCity/header.inc @@ -1,7 +1,7 @@ CeladonCity:: @ 83506C0 .4byte CeladonCity_Layout @ 0x82E2818 - .4byte gMapEvents_CeladonCity @ 0x83B5898 - .4byte gMapScripts_CeladonCity @ 0x8166C8F + .4byte CeladonCity_MapEvents @ 0x83B5898 + .4byte CeladonCity_MapScripts @ 0x8166C8F .4byte CeladonCity_MapConnections @ 0x835285C .2byte BGM_FRLG_CELADON_CITY .2byte 84 diff --git a/data/maps/CeladonCity_Condominiums_1F/header.inc b/data/maps/CeladonCity_Condominiums_1F/header.inc index 9b842ae2d..b059b11fd 100644 --- a/data/maps/CeladonCity_Condominiums_1F/header.inc +++ b/data/maps/CeladonCity_Condominiums_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_1F:: @ 83512AC .4byte CeladonCity_Condominiums_1F_Layout @ 0x831A7DC - .4byte gMapEvents_CeladonCity_Condominiums_1F @ 0x83BB538 - .4byte gMapScripts_CeladonCity_Condominiums_1F @ 0x816C320 + .4byte CeladonCity_Condominiums_1F_MapEvents @ 0x83BB538 + .4byte CeladonCity_Condominiums_1F_MapScripts @ 0x816C320 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 184 diff --git a/data/maps/CeladonCity_Condominiums_2F/header.inc b/data/maps/CeladonCity_Condominiums_2F/header.inc index 46bc1451a..2a380d25d 100644 --- a/data/maps/CeladonCity_Condominiums_2F/header.inc +++ b/data/maps/CeladonCity_Condominiums_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_2F:: @ 83512C8 .4byte CeladonCity_Condominiums_2F_Layout @ 0x831AA58 - .4byte gMapEvents_CeladonCity_Condominiums_2F @ 0x83BB5B4 - .4byte gMapScripts_CeladonCity_Condominiums_2F @ 0x816C3D0 + .4byte CeladonCity_Condominiums_2F_MapEvents @ 0x83BB5B4 + .4byte CeladonCity_Condominiums_2F_MapScripts @ 0x816C3D0 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 185 diff --git a/data/maps/CeladonCity_Condominiums_3F/header.inc b/data/maps/CeladonCity_Condominiums_3F/header.inc index 3af5071bb..e945a6abe 100644 --- a/data/maps/CeladonCity_Condominiums_3F/header.inc +++ b/data/maps/CeladonCity_Condominiums_3F/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_3F:: @ 83512E4 .4byte CeladonCity_Condominiums_3F_Layout @ 0x831ACD4 - .4byte gMapEvents_CeladonCity_Condominiums_3F @ 0x83BB6A8 - .4byte gMapScripts_CeladonCity_Condominiums_3F @ 0x816C3DA + .4byte CeladonCity_Condominiums_3F_MapEvents @ 0x83BB6A8 + .4byte CeladonCity_Condominiums_3F_MapScripts @ 0x816C3DA .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 186 diff --git a/data/maps/CeladonCity_Condominiums_Roof/header.inc b/data/maps/CeladonCity_Condominiums_Roof/header.inc index 8ae163248..e858a73f0 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/header.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_Roof:: @ 8351300 .4byte CeladonCity_Condominiums_Roof_Layout @ 0x831AF7C - .4byte gMapEvents_CeladonCity_Condominiums_Roof @ 0x83BB6EC - .4byte gMapScripts_CeladonCity_Condominiums_Roof @ 0x816C459 + .4byte CeladonCity_Condominiums_Roof_MapEvents @ 0x83BB6EC + .4byte CeladonCity_Condominiums_Roof_MapScripts @ 0x816C459 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 187 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc index 7bc9c4eb8..23c2ed330 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/header.inc @@ -1,7 +1,7 @@ CeladonCity_Condominiums_RoofRoom:: @ 835131C .4byte CeladonCity_Condominiums_RoofRoom_Layout @ 0x831B054 - .4byte gMapEvents_CeladonCity_Condominiums_RoofRoom @ 0x83BB76C - .4byte gMapScripts_CeladonCity_Condominiums_RoofRoom @ 0x816C463 + .4byte CeladonCity_Condominiums_RoofRoom_MapEvents @ 0x83BB76C + .4byte CeladonCity_Condominiums_RoofRoom_MapScripts @ 0x816C463 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 188 diff --git a/data/maps/CeladonCity_DepartmentStore_1F/header.inc b/data/maps/CeladonCity_DepartmentStore_1F/header.inc index 3ddab14ae..07b027ede 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_1F:: @ 83511E8 .4byte CeladonCity_DepartmentStore_1F_Layout @ 0x831B5FC - .4byte gMapEvents_CeladonCity_DepartmentStore_1F @ 0x83BB0EC - .4byte gMapScripts_CeladonCity_DepartmentStore_1F @ 0x816BAD8 + .4byte CeladonCity_DepartmentStore_1F_MapEvents @ 0x83BB0EC + .4byte CeladonCity_DepartmentStore_1F_MapScripts @ 0x816BAD8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 192 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/header.inc b/data/maps/CeladonCity_DepartmentStore_2F/header.inc index 126b23342..48afe690e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_2F:: @ 8351204 .4byte CeladonCity_DepartmentStore_2F_Layout @ 0x831B7A8 - .4byte gMapEvents_CeladonCity_DepartmentStore_2F @ 0x83BB184 - .4byte gMapScripts_CeladonCity_DepartmentStore_2F @ 0x816BAF4 + .4byte CeladonCity_DepartmentStore_2F_MapEvents @ 0x83BB184 + .4byte CeladonCity_DepartmentStore_2F_MapScripts @ 0x816BAF4 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 193 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/header.inc b/data/maps/CeladonCity_DepartmentStore_3F/header.inc index cb31d4ae4..9bfb8d3c4 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_3F:: @ 8351220 .4byte CeladonCity_DepartmentStore_3F_Layout @ 0x831B954 - .4byte gMapEvents_CeladonCity_DepartmentStore_3F @ 0x83BB2AC - .4byte gMapScripts_CeladonCity_DepartmentStore_3F @ 0x816BB84 + .4byte CeladonCity_DepartmentStore_3F_MapEvents @ 0x83BB2AC + .4byte CeladonCity_DepartmentStore_3F_MapScripts @ 0x816BB84 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 194 diff --git a/data/maps/CeladonCity_DepartmentStore_4F/header.inc b/data/maps/CeladonCity_DepartmentStore_4F/header.inc index 5cd6b390a..e25a983da 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_4F:: @ 835123C .4byte CeladonCity_DepartmentStore_4F_Layout @ 0x831BB00 - .4byte gMapEvents_CeladonCity_DepartmentStore_4F @ 0x83BB32C - .4byte gMapScripts_CeladonCity_DepartmentStore_4F @ 0x816BBEE + .4byte CeladonCity_DepartmentStore_4F_MapEvents @ 0x83BB32C + .4byte CeladonCity_DepartmentStore_4F_MapScripts @ 0x816BBEE .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 195 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/header.inc b/data/maps/CeladonCity_DepartmentStore_5F/header.inc index 853a6e4f2..321174026 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_5F:: @ 8351258 .4byte CeladonCity_DepartmentStore_5F_Layout @ 0x831BCAC - .4byte gMapEvents_CeladonCity_DepartmentStore_5F @ 0x83BB3C4 - .4byte gMapScripts_CeladonCity_DepartmentStore_5F @ 0x816BC40 + .4byte CeladonCity_DepartmentStore_5F_MapEvents @ 0x83BB3C4 + .4byte CeladonCity_DepartmentStore_5F_MapScripts @ 0x816BC40 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 196 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc index c78e6449a..e7086ace2 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Elevator:: @ 8351290 .4byte CeladonCity_DepartmentStore_Elevator_Layout @ 0x8319F70 - .4byte gMapEvents_CeladonCity_DepartmentStore_Elevator @ 0x83BB47C - .4byte gMapScripts_CeladonCity_DepartmentStore_Elevator @ 0x816C152 + .4byte CeladonCity_DepartmentStore_Elevator_MapEvents @ 0x83BB47C + .4byte CeladonCity_DepartmentStore_Elevator_MapScripts @ 0x816C152 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 179 diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc index a8839e6f9..bed42ffb5 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/header.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/header.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Roof:: @ 8351274 .4byte CeladonCity_DepartmentStore_Roof_Layout @ 0x831BEE4 - .4byte gMapEvents_CeladonCity_DepartmentStore_Roof @ 0x83BB440 - .4byte gMapScripts_CeladonCity_DepartmentStore_Roof @ 0x816BCCC + .4byte CeladonCity_DepartmentStore_Roof_MapEvents @ 0x83BB440 + .4byte CeladonCity_DepartmentStore_Roof_MapScripts @ 0x816BCCC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 197 diff --git a/data/maps/CeladonCity_GameCorner/header.inc b/data/maps/CeladonCity_GameCorner/header.inc index 61c4177d9..dde1f5a6d 100644 --- a/data/maps/CeladonCity_GameCorner/header.inc +++ b/data/maps/CeladonCity_GameCorner/header.inc @@ -1,7 +1,7 @@ CeladonCity_GameCorner:: @ 8351370 .4byte CeladonCity_GameCorner_Layout @ 0x82D7168 - .4byte gMapEvents_CeladonCity_GameCorner @ 0x83BBB78 - .4byte gMapScripts_CeladonCity_GameCorner @ 0x816C646 + .4byte CeladonCity_GameCorner_MapEvents @ 0x83BBB78 + .4byte CeladonCity_GameCorner_MapScripts @ 0x816C646 .4byte NULL .2byte BGM_FRLG_GAMECORNER .2byte 27 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc index 5577d1f3e..4db3fedfb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/header.inc @@ -1,7 +1,7 @@ CeladonCity_GameCorner_PrizeRoom:: @ 835138C .4byte CeladonCity_GameCorner_PrizeRoom_Layout @ 0x831B12C - .4byte gMapEvents_CeladonCity_GameCorner_PrizeRoom @ 0x83BBC1C - .4byte gMapScripts_CeladonCity_GameCorner_PrizeRoom @ 0x816CB75 + .4byte CeladonCity_GameCorner_PrizeRoom_MapEvents @ 0x83BBC1C + .4byte CeladonCity_GameCorner_PrizeRoom_MapScripts @ 0x816CB75 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 189 diff --git a/data/maps/CeladonCity_Gym/header.inc b/data/maps/CeladonCity_Gym/header.inc index 3c04d2673..59ca7c533 100644 --- a/data/maps/CeladonCity_Gym/header.inc +++ b/data/maps/CeladonCity_Gym/header.inc @@ -1,7 +1,7 @@ CeladonCity_Gym:: @ 83513A8 .4byte CeladonCity_Gym_Layout @ 0x82D6370 - .4byte gMapEvents_CeladonCity_Gym @ 0x83BBD68 - .4byte gMapScripts_CeladonCity_Gym @ 0x816D060 + .4byte CeladonCity_Gym_MapEvents @ 0x83BBD68 + .4byte CeladonCity_Gym_MapScripts @ 0x816D060 .4byte NULL .2byte BGM_FRLG_GYM .2byte 15 diff --git a/data/maps/CeladonCity_Hotel/header.inc b/data/maps/CeladonCity_Hotel/header.inc index 553b4c924..b9aecb9a8 100644 --- a/data/maps/CeladonCity_Hotel/header.inc +++ b/data/maps/CeladonCity_Hotel/header.inc @@ -1,7 +1,7 @@ CeladonCity_Hotel:: @ 83513FC .4byte CeladonCity_Hotel_Layout @ 0x831B438 - .4byte gMapEvents_CeladonCity_Hotel @ 0x83BBF0C - .4byte gMapScripts_CeladonCity_Hotel @ 0x816D283 + .4byte CeladonCity_Hotel_MapEvents @ 0x83BBF0C + .4byte CeladonCity_Hotel_MapScripts @ 0x816D283 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 191 diff --git a/data/maps/CeladonCity_House1/header.inc b/data/maps/CeladonCity_House1/header.inc index 37e671cce..6b0b740f1 100644 --- a/data/maps/CeladonCity_House1/header.inc +++ b/data/maps/CeladonCity_House1/header.inc @@ -1,7 +1,7 @@ CeladonCity_House1:: @ 83513E0 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_CeladonCity_House1 @ 0x83BBE80 - .4byte gMapScripts_CeladonCity_House1 @ 0x816D267 + .4byte CeladonCity_House1_MapEvents @ 0x83BBE80 + .4byte CeladonCity_House1_MapScripts @ 0x816D267 .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 21 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/header.inc b/data/maps/CeladonCity_PokemonCenter_1F/header.inc index c29ce7f43..5875a816d 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/header.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CeladonCity_PokemonCenter_1F:: @ 8351338 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CeladonCity_PokemonCenter_1F @ 0x83BB800 - .4byte gMapScripts_CeladonCity_PokemonCenter_1F @ 0x816C5EC + .4byte CeladonCity_PokemonCenter_1F_MapEvents @ 0x83BB800 + .4byte CeladonCity_PokemonCenter_1F_MapScripts @ 0x816C5EC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/header.inc b/data/maps/CeladonCity_PokemonCenter_2F/header.inc index d3f2b260e..217db66f2 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/header.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CeladonCity_PokemonCenter_2F:: @ 8351354 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CeladonCity_PokemonCenter_2F @ 0x83BB88C - .4byte gMapScripts_CeladonCity_PokemonCenter_2F @ 0x816C61F + .4byte CeladonCity_PokemonCenter_2F_MapEvents @ 0x83BB88C + .4byte CeladonCity_PokemonCenter_2F_MapScripts @ 0x816C61F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CeladonCity_Restaurant/header.inc b/data/maps/CeladonCity_Restaurant/header.inc index c588eb45d..2bd3f3867 100644 --- a/data/maps/CeladonCity_Restaurant/header.inc +++ b/data/maps/CeladonCity_Restaurant/header.inc @@ -1,7 +1,7 @@ CeladonCity_Restaurant:: @ 83513C4 .4byte CeladonCity_Restaurant_Layout @ 0x831B29C - .4byte gMapEvents_CeladonCity_Restaurant @ 0x83BBE0C - .4byte gMapScripts_CeladonCity_Restaurant @ 0x816D1EA + .4byte CeladonCity_Restaurant_MapEvents @ 0x83BBE0C + .4byte CeladonCity_Restaurant_MapScripts @ 0x816D1EA .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 190 diff --git a/data/maps/CeruleanCave_1F/header.inc b/data/maps/CeruleanCave_1F/header.inc index ec467c13e..9bedd6dd6 100644 --- a/data/maps/CeruleanCave_1F/header.inc +++ b/data/maps/CeruleanCave_1F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_1F:: @ 834F9F4 .4byte CeruleanCave_1F_Layout @ 0x8311318 - .4byte gMapEvents_CeruleanCave_1F @ 0x83B15BC - .4byte gMapScripts_CeruleanCave_1F @ 0x81624B3 + .4byte CeruleanCave_1F_MapEvents @ 0x83B15BC + .4byte CeruleanCave_1F_MapScripts @ 0x81624B3 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 151 diff --git a/data/maps/CeruleanCave_2F/header.inc b/data/maps/CeruleanCave_2F/header.inc index 7fe8ccc03..37e25ef1b 100644 --- a/data/maps/CeruleanCave_2F/header.inc +++ b/data/maps/CeruleanCave_2F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_2F:: @ 834FA10 .4byte CeruleanCave_2F_Layout @ 0x8311A6C - .4byte gMapEvents_CeruleanCave_2F @ 0x83B1738 - .4byte gMapScripts_CeruleanCave_2F @ 0x81624BD + .4byte CeruleanCave_2F_MapEvents @ 0x83B1738 + .4byte CeruleanCave_2F_MapScripts @ 0x81624BD .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 152 diff --git a/data/maps/CeruleanCave_B1F/header.inc b/data/maps/CeruleanCave_B1F/header.inc index 89eaec278..88608f654 100644 --- a/data/maps/CeruleanCave_B1F/header.inc +++ b/data/maps/CeruleanCave_B1F/header.inc @@ -1,7 +1,7 @@ CeruleanCave_B1F:: @ 834FA2C .4byte CeruleanCave_B1F_Layout @ 0x83121C0 - .4byte gMapEvents_CeruleanCave_B1F @ 0x83B1874 - .4byte gMapScripts_CeruleanCave_B1F @ 0x81624BE + .4byte CeruleanCave_B1F_MapEvents @ 0x83B1874 + .4byte CeruleanCave_B1F_MapScripts @ 0x81624BE .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 153 diff --git a/data/maps/CeruleanCity/header.inc b/data/maps/CeruleanCity/header.inc index 7f1bed354..720840bf0 100644 --- a/data/maps/CeruleanCity/header.inc +++ b/data/maps/CeruleanCity/header.inc @@ -1,7 +1,7 @@ CeruleanCity:: @ 835066C .4byte CeruleanCity_Layout @ 0x82E022C - .4byte gMapEvents_CeruleanCity @ 0x83B53E0 - .4byte gMapScripts_CeruleanCity @ 0x8166471 + .4byte CeruleanCity_MapEvents @ 0x83B53E0 + .4byte CeruleanCity_MapScripts @ 0x8166471 .4byte CeruleanCity_MapConnections @ 0x83527F0 .2byte BGM_FRLG_CERULEAN_CITY .2byte 81 diff --git a/data/maps/CeruleanCity_BikeShop/header.inc b/data/maps/CeruleanCity_BikeShop/header.inc index 8fd15ec07..3f2bd4de1 100644 --- a/data/maps/CeruleanCity_BikeShop/header.inc +++ b/data/maps/CeruleanCity_BikeShop/header.inc @@ -1,7 +1,7 @@ CeruleanCity_BikeShop:: @ 8350FF0 .4byte CeruleanCity_BikeShop_Layout @ 0x82D6F28 - .4byte gMapEvents_CeruleanCity_BikeShop @ 0x83BA6FC - .4byte gMapScripts_CeruleanCity_BikeShop @ 0x816ABBC + .4byte CeruleanCity_BikeShop_MapEvents @ 0x83BA6FC + .4byte CeruleanCity_BikeShop_MapScripts @ 0x816ABBC .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 26 diff --git a/data/maps/CeruleanCity_Gym/header.inc b/data/maps/CeruleanCity_Gym/header.inc index 601a9700c..3b3b044e4 100644 --- a/data/maps/CeruleanCity_Gym/header.inc +++ b/data/maps/CeruleanCity_Gym/header.inc @@ -1,7 +1,7 @@ CeruleanCity_Gym:: @ 8350FD4 .4byte CeruleanCity_Gym_Layout @ 0x82D5F84 - .4byte gMapEvents_CeruleanCity_Gym @ 0x83BA628 - .4byte gMapScripts_CeruleanCity_Gym @ 0x816AAA0 + .4byte CeruleanCity_Gym_MapEvents @ 0x83BA628 + .4byte CeruleanCity_Gym_MapScripts @ 0x816AAA0 .4byte NULL .2byte BGM_FRLG_GYM .2byte 12 diff --git a/data/maps/CeruleanCity_House1/header.inc b/data/maps/CeruleanCity_House1/header.inc index 622ef5334..092348c5b 100644 --- a/data/maps/CeruleanCity_House1/header.inc +++ b/data/maps/CeruleanCity_House1/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House1:: @ 8350F48 .4byte CeruleanCity_House1_Layout @ 0x831A560 - .4byte gMapEvents_CeruleanCity_House1 @ 0x83BA350 - .4byte gMapScripts_CeruleanCity_House1 @ 0x816A7EF + .4byte CeruleanCity_House1_MapEvents @ 0x83BA350 + .4byte CeruleanCity_House1_MapScripts @ 0x816A7EF .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 183 diff --git a/data/maps/CeruleanCity_House2/header.inc b/data/maps/CeruleanCity_House2/header.inc index 0cc637603..66b02a6a6 100644 --- a/data/maps/CeruleanCity_House2/header.inc +++ b/data/maps/CeruleanCity_House2/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House2:: @ 8350F64 .4byte CeruleanCity_House2_Layout @ 0x831A474 - .4byte gMapEvents_CeruleanCity_House2 @ 0x83BA3C0 - .4byte gMapScripts_CeruleanCity_House2 @ 0x816A975 + .4byte CeruleanCity_House2_MapEvents @ 0x83BA3C0 + .4byte CeruleanCity_House2_MapScripts @ 0x816A975 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 182 diff --git a/data/maps/CeruleanCity_House3/header.inc b/data/maps/CeruleanCity_House3/header.inc index bcaabf913..6e5885015 100644 --- a/data/maps/CeruleanCity_House3/header.inc +++ b/data/maps/CeruleanCity_House3/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House3:: @ 8350F80 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_CeruleanCity_House3 @ 0x83BA41C - .4byte gMapScripts_CeruleanCity_House3 @ 0x816A9A7 + .4byte CeruleanCity_House3_MapEvents @ 0x83BA41C + .4byte CeruleanCity_House3_MapScripts @ 0x816A9A7 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/CeruleanCity_House4/header.inc b/data/maps/CeruleanCity_House4/header.inc index 4996f7e7a..979bc788e 100644 --- a/data/maps/CeruleanCity_House4/header.inc +++ b/data/maps/CeruleanCity_House4/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House4:: @ 8351028 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_CeruleanCity_House4 @ 0x83BA7A4 - .4byte gMapScripts_CeruleanCity_House4 @ 0x816ACEE + .4byte CeruleanCity_House4_MapEvents @ 0x83BA7A4 + .4byte CeruleanCity_House4_MapScripts @ 0x816ACEE .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/CeruleanCity_House5/header.inc b/data/maps/CeruleanCity_House5/header.inc index 317e64841..1c11eb58a 100644 --- a/data/maps/CeruleanCity_House5/header.inc +++ b/data/maps/CeruleanCity_House5/header.inc @@ -1,7 +1,7 @@ CeruleanCity_House5:: @ 8351044 .4byte CeruleanCity_House5_Layout @ 0x8343540 - .4byte gMapEvents_CeruleanCity_House5 @ 0x83BA7E4 - .4byte gMapScripts_CeruleanCity_House5 @ 0x816AE4F + .4byte CeruleanCity_House5_MapEvents @ 0x83BA7E4 + .4byte CeruleanCity_House5_MapScripts @ 0x816AE4F .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 308 diff --git a/data/maps/CeruleanCity_Mart/header.inc b/data/maps/CeruleanCity_Mart/header.inc index b12b85b10..592847fdf 100644 --- a/data/maps/CeruleanCity_Mart/header.inc +++ b/data/maps/CeruleanCity_Mart/header.inc @@ -1,7 +1,7 @@ CeruleanCity_Mart:: @ 835100C .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_CeruleanCity_Mart @ 0x83BA770 - .4byte gMapScripts_CeruleanCity_Mart @ 0x816AC9D + .4byte CeruleanCity_Mart_MapEvents @ 0x83BA770 + .4byte CeruleanCity_Mart_MapScripts @ 0x816AC9D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc index 810354b9c..9978c2508 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/header.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CeruleanCity_PokemonCenter_1F:: @ 8350F9C .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CeruleanCity_PokemonCenter_1F @ 0x83BA4F8 - .4byte gMapScripts_CeruleanCity_PokemonCenter_1F @ 0x816AA2D + .4byte CeruleanCity_PokemonCenter_1F_MapEvents @ 0x83BA4F8 + .4byte CeruleanCity_PokemonCenter_1F_MapScripts @ 0x816AA2D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc index 697f7b369..6a650315e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/header.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CeruleanCity_PokemonCenter_2F:: @ 8350FB8 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CeruleanCity_PokemonCenter_2F @ 0x83BA584 - .4byte gMapScripts_CeruleanCity_PokemonCenter_2F @ 0x816AA79 + .4byte CeruleanCity_PokemonCenter_2F_MapEvents @ 0x83BA584 + .4byte CeruleanCity_PokemonCenter_2F_MapScripts @ 0x816AA79 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CinnabarIsland/header.inc b/data/maps/CinnabarIsland/header.inc index 9b614bd26..49ec94a3b 100644 --- a/data/maps/CinnabarIsland/header.inc +++ b/data/maps/CinnabarIsland/header.inc @@ -1,7 +1,7 @@ CinnabarIsland:: @ 83506F8 .4byte CinnabarIsland_Layout @ 0x82E3B20 - .4byte gMapEvents_CinnabarIsland @ 0x83B5BF0 - .4byte gMapScripts_CinnabarIsland @ 0x8166ED6 + .4byte CinnabarIsland_MapEvents @ 0x83B5BF0 + .4byte CinnabarIsland_MapScripts @ 0x8166ED6 .4byte CinnabarIsland_MapConnections @ 0x83528A8 .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 86 diff --git a/data/maps/CinnabarIsland_Gym/header.inc b/data/maps/CinnabarIsland_Gym/header.inc index 8e810be7e..902408c88 100644 --- a/data/maps/CinnabarIsland_Gym/header.inc +++ b/data/maps/CinnabarIsland_Gym/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_Gym:: @ 8351530 .4byte CinnabarIsland_Gym_Layout @ 0x82D82C8 - .4byte gMapEvents_CinnabarIsland_Gym @ 0x83BC62C - .4byte gMapScripts_CinnabarIsland_Gym @ 0x816D94B + .4byte CinnabarIsland_Gym_MapEvents @ 0x83BC62C + .4byte CinnabarIsland_Gym_MapScripts @ 0x816D94B .4byte NULL .2byte BGM_FRLG_GYM .2byte 36 diff --git a/data/maps/CinnabarIsland_Mart/header.inc b/data/maps/CinnabarIsland_Mart/header.inc index f6abdf48e..db46f06e4 100644 --- a/data/maps/CinnabarIsland_Mart/header.inc +++ b/data/maps/CinnabarIsland_Mart/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_Mart:: @ 83515F4 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_CinnabarIsland_Mart @ 0x83BC9A8 - .4byte gMapScripts_CinnabarIsland_Mart @ 0x816EA0F + .4byte CinnabarIsland_Mart_MapEvents @ 0x83BC9A8 + .4byte CinnabarIsland_Mart_MapScripts @ 0x816EA0F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc index 4d0aac7b3..61259eee7 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonCenter_1F:: @ 83515BC .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_CinnabarIsland_PokemonCenter_1F @ 0x83BC8A8 - .4byte gMapScripts_CinnabarIsland_PokemonCenter_1F @ 0x816E8D7 + .4byte CinnabarIsland_PokemonCenter_1F_MapEvents @ 0x83BC8A8 + .4byte CinnabarIsland_PokemonCenter_1F_MapScripts @ 0x816E8D7 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc index 01c1b0eb9..462076704 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonCenter_2F:: @ 83515D8 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_CinnabarIsland_PokemonCenter_2F @ 0x83BC934 - .4byte gMapScripts_CinnabarIsland_PokemonCenter_2F @ 0x816E9E8 + .4byte CinnabarIsland_PokemonCenter_2F_MapEvents @ 0x83BC934 + .4byte CinnabarIsland_PokemonCenter_2F_MapScripts @ 0x816E9E8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc index 4e97c56f2..8f1b3ce10 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_Entrance:: @ 835154C .4byte CinnabarIsland_PokemonLab_Entrance_Layout @ 0x831C804 - .4byte gMapEvents_CinnabarIsland_PokemonLab_Entrance @ 0x83BC6B8 - .4byte gMapScripts_CinnabarIsland_PokemonLab_Entrance @ 0x816E273 + .4byte CinnabarIsland_PokemonLab_Entrance_MapEvents @ 0x83BC6B8 + .4byte CinnabarIsland_PokemonLab_Entrance_MapScripts @ 0x816E273 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 203 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc index 866b195ca..f3dca36f6 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom:: @ 83515A0 .4byte CinnabarIsland_PokemonLab_ExperimentRoom_Layout @ 0x831CC54 - .4byte gMapEvents_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x83BC7CC - .4byte gMapScripts_CinnabarIsland_PokemonLab_ExperimentRoom @ 0x816E400 + .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapEvents @ 0x83BC7CC + .4byte CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts @ 0x816E400 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 206 diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc index 0e0fe0525..ae3a567d7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_Lounge:: @ 8351568 .4byte CinnabarIsland_PokemonLab_Lounge_Layout @ 0x831C974 - .4byte gMapEvents_CinnabarIsland_PokemonLab_Lounge @ 0x83BC71C - .4byte gMapScripts_CinnabarIsland_PokemonLab_Lounge @ 0x816E2B8 + .4byte CinnabarIsland_PokemonLab_Lounge_MapEvents @ 0x83BC71C + .4byte CinnabarIsland_PokemonLab_Lounge_MapScripts @ 0x816E2B8 .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 204 diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc index 8c8f7bc28..34e60e452 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/header.inc @@ -1,7 +1,7 @@ CinnabarIsland_PokemonLab_ResearchRoom:: @ 8351584 .4byte CinnabarIsland_PokemonLab_ResearchRoom_Layout @ 0x831CAE4 - .4byte gMapEvents_CinnabarIsland_PokemonLab_ResearchRoom @ 0x83BC780 - .4byte gMapScripts_CinnabarIsland_PokemonLab_ResearchRoom @ 0x816E3DE + .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapEvents @ 0x83BC780 + .4byte CinnabarIsland_PokemonLab_ResearchRoom_MapScripts @ 0x816E3DE .4byte NULL .2byte BGM_FRLG_CINNABAR_ISLAND .2byte 205 diff --git a/data/maps/DiglettsCave_B1F/header.inc b/data/maps/DiglettsCave_B1F/header.inc index 7ebb82a62..c72ae342e 100644 --- a/data/maps/DiglettsCave_B1F/header.inc +++ b/data/maps/DiglettsCave_B1F/header.inc @@ -1,7 +1,7 @@ DiglettsCave_B1F:: @ 834F620 .4byte DiglettsCave_B1F_Layout @ 0x8303B68 - .4byte gMapEvents_DiglettsCave_B1F @ 0x83AF490 - .4byte gMapScripts_DiglettsCave_B1F @ 0x8160EF1 + .4byte DiglettsCave_B1F_MapEvents @ 0x83AF490 + .4byte DiglettsCave_B1F_MapScripts @ 0x8160EF1 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 124 diff --git a/data/maps/DiglettsCave_NorthEntrance/header.inc b/data/maps/DiglettsCave_NorthEntrance/header.inc index 47df9cac9..ecdeaba44 100644 --- a/data/maps/DiglettsCave_NorthEntrance/header.inc +++ b/data/maps/DiglettsCave_NorthEntrance/header.inc @@ -1,7 +1,7 @@ DiglettsCave_NorthEntrance:: @ 834F604 .4byte DiglettsCave_NorthEntrance_Layout @ 0x831EB94 - .4byte gMapEvents_DiglettsCave_NorthEntrance @ 0x83AF46C - .4byte gMapScripts_DiglettsCave_NorthEntrance @ 0x8160EE7 + .4byte DiglettsCave_NorthEntrance_MapEvents @ 0x83AF46C + .4byte DiglettsCave_NorthEntrance_MapScripts @ 0x8160EE7 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 210 diff --git a/data/maps/DiglettsCave_SouthEntrance/header.inc b/data/maps/DiglettsCave_SouthEntrance/header.inc index 1651d502b..5c84c5307 100644 --- a/data/maps/DiglettsCave_SouthEntrance/header.inc +++ b/data/maps/DiglettsCave_SouthEntrance/header.inc @@ -1,7 +1,7 @@ DiglettsCave_SouthEntrance:: @ 834F63C .4byte DiglettsCave_SouthEntrance_Layout @ 0x831EC58 - .4byte gMapEvents_DiglettsCave_SouthEntrance @ 0x83AF4CC - .4byte gMapScripts_DiglettsCave_SouthEntrance @ 0x8160EFB + .4byte DiglettsCave_SouthEntrance_MapEvents @ 0x83AF4CC + .4byte DiglettsCave_SouthEntrance_MapScripts @ 0x8160EFB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 211 diff --git a/data/maps/FiveIsland/header.inc b/data/maps/FiveIsland/header.inc index ee274936b..b38c6fa44 100644 --- a/data/maps/FiveIsland/header.inc +++ b/data/maps/FiveIsland/header.inc @@ -1,7 +1,7 @@ FiveIsland:: @ 83507D8 .4byte FiveIsland_Layout @ 0x8323964 - .4byte gMapEvents_FiveIsland @ 0x83B64F4 - .4byte gMapScripts_FiveIsland @ 0x8167E8E + .4byte FiveIsland_MapEvents @ 0x83B64F4 + .4byte FiveIsland_MapScripts @ 0x8167E8E .4byte FiveIsland_MapConnections @ 0x83529A0 .2byte BGM_FRLG_ISLAND_FOUR .2byte 234 diff --git a/data/maps/FiveIsland_Harbor/header.inc b/data/maps/FiveIsland_Harbor/header.inc index 623c90298..1f7a96309 100644 --- a/data/maps/FiveIsland_Harbor/header.inc +++ b/data/maps/FiveIsland_Harbor/header.inc @@ -1,7 +1,7 @@ FiveIsland_Harbor:: @ 8351E7C .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_FiveIsland_Harbor @ 0x83BEFB4 - .4byte gMapScripts_FiveIsland_Harbor @ 0x8171D42 + .4byte FiveIsland_Harbor_MapEvents @ 0x83BEFB4 + .4byte FiveIsland_Harbor_MapScripts @ 0x8171D42 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 315 diff --git a/data/maps/FiveIsland_House1/header.inc b/data/maps/FiveIsland_House1/header.inc index f33f9b4aa..11d3865ff 100644 --- a/data/maps/FiveIsland_House1/header.inc +++ b/data/maps/FiveIsland_House1/header.inc @@ -1,7 +1,7 @@ FiveIsland_House1:: @ 8351E98 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FiveIsland_House1 @ 0x83BEFE8 - .4byte gMapScripts_FiveIsland_House1 @ 0x8171D56 + .4byte FiveIsland_House1_MapEvents @ 0x83BEFE8 + .4byte FiveIsland_House1_MapScripts @ 0x8171D56 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FiveIsland_House2/header.inc b/data/maps/FiveIsland_House2/header.inc index 10a02b0ae..09a7f015f 100644 --- a/data/maps/FiveIsland_House2/header.inc +++ b/data/maps/FiveIsland_House2/header.inc @@ -1,7 +1,7 @@ FiveIsland_House2:: @ 8351EB4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FiveIsland_House2 @ 0x83BF01C - .4byte gMapScripts_FiveIsland_House2 @ 0x8171D60 + .4byte FiveIsland_House2_MapEvents @ 0x83BF01C + .4byte FiveIsland_House2_MapScripts @ 0x8171D60 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FiveIsland_LostCave_Entrance/header.inc b/data/maps/FiveIsland_LostCave_Entrance/header.inc index be1cff1e3..937061b53 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/header.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Entrance:: @ 83500D8 .4byte FiveIsland_LostCave_Entrance_Layout @ 0x83454D8 - .4byte gMapEvents_FiveIsland_LostCave_Entrance @ 0x83B4354 - .4byte gMapScripts_FiveIsland_LostCave_Entrance @ 0x8164BEC + .4byte FiveIsland_LostCave_Entrance_MapEvents @ 0x83B4354 + .4byte FiveIsland_LostCave_Entrance_MapScripts @ 0x8164BEC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 320 diff --git a/data/maps/FiveIsland_LostCave_Room1/header.inc b/data/maps/FiveIsland_LostCave_Room1/header.inc index 053bb4dee..c251be2c2 100644 --- a/data/maps/FiveIsland_LostCave_Room1/header.inc +++ b/data/maps/FiveIsland_LostCave_Room1/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room1:: @ 83500F4 .4byte FiveIsland_LostCave_Room1_Layout @ 0x83455F0 - .4byte gMapEvents_FiveIsland_LostCave_Room1 @ 0x83B43A8 - .4byte gMapScripts_FiveIsland_LostCave_Room1 @ 0x8164BF6 + .4byte FiveIsland_LostCave_Room1_MapEvents @ 0x83B43A8 + .4byte FiveIsland_LostCave_Room1_MapScripts @ 0x8164BF6 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 321 diff --git a/data/maps/FiveIsland_LostCave_Room10/header.inc b/data/maps/FiveIsland_LostCave_Room10/header.inc index f770a1340..e27634f92 100644 --- a/data/maps/FiveIsland_LostCave_Room10/header.inc +++ b/data/maps/FiveIsland_LostCave_Room10/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room10:: @ 83501F0 .4byte FiveIsland_LostCave_Room10_Layout @ 0x8345FC8 - .4byte gMapEvents_FiveIsland_LostCave_Room10 @ 0x83B45AC - .4byte gMapScripts_FiveIsland_LostCave_Room10 @ 0x8164C2D + .4byte FiveIsland_LostCave_Room10_MapEvents @ 0x83B45AC + .4byte FiveIsland_LostCave_Room10_MapScripts @ 0x8164C2D .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 330 diff --git a/data/maps/FiveIsland_LostCave_Room11/header.inc b/data/maps/FiveIsland_LostCave_Room11/header.inc index 4e047faf2..56457b055 100644 --- a/data/maps/FiveIsland_LostCave_Room11/header.inc +++ b/data/maps/FiveIsland_LostCave_Room11/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room11:: @ 835020C .4byte FiveIsland_LostCave_Room11_Layout @ 0x83460E0 - .4byte gMapEvents_FiveIsland_LostCave_Room11 @ 0x83B45E0 - .4byte gMapScripts_FiveIsland_LostCave_Room11 @ 0x8164CCB + .4byte FiveIsland_LostCave_Room11_MapEvents @ 0x83B45E0 + .4byte FiveIsland_LostCave_Room11_MapScripts @ 0x8164CCB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 331 diff --git a/data/maps/FiveIsland_LostCave_Room12/header.inc b/data/maps/FiveIsland_LostCave_Room12/header.inc index 417712f1b..8629a364d 100644 --- a/data/maps/FiveIsland_LostCave_Room12/header.inc +++ b/data/maps/FiveIsland_LostCave_Room12/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room12:: @ 8350228 .4byte FiveIsland_LostCave_Room12_Layout @ 0x83461F8 - .4byte gMapEvents_FiveIsland_LostCave_Room12 @ 0x83B4614 - .4byte gMapScripts_FiveIsland_LostCave_Room12 @ 0x8164CCC + .4byte FiveIsland_LostCave_Room12_MapEvents @ 0x83B4614 + .4byte FiveIsland_LostCave_Room12_MapScripts @ 0x8164CCC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 332 diff --git a/data/maps/FiveIsland_LostCave_Room13/header.inc b/data/maps/FiveIsland_LostCave_Room13/header.inc index cbe00c496..cda5b3670 100644 --- a/data/maps/FiveIsland_LostCave_Room13/header.inc +++ b/data/maps/FiveIsland_LostCave_Room13/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room13:: @ 8350244 .4byte FiveIsland_LostCave_Room13_Layout @ 0x8346310 - .4byte gMapEvents_FiveIsland_LostCave_Room13 @ 0x83B4648 - .4byte gMapScripts_FiveIsland_LostCave_Room13 @ 0x8164CCD + .4byte FiveIsland_LostCave_Room13_MapEvents @ 0x83B4648 + .4byte FiveIsland_LostCave_Room13_MapScripts @ 0x8164CCD .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 333 diff --git a/data/maps/FiveIsland_LostCave_Room14/header.inc b/data/maps/FiveIsland_LostCave_Room14/header.inc index 036d47e93..6470895b4 100644 --- a/data/maps/FiveIsland_LostCave_Room14/header.inc +++ b/data/maps/FiveIsland_LostCave_Room14/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room14:: @ 8350260 .4byte FiveIsland_LostCave_Room14_Layout @ 0x8346428 - .4byte gMapEvents_FiveIsland_LostCave_Room14 @ 0x83B467C - .4byte gMapScripts_FiveIsland_LostCave_Room14 @ 0x8164CCE + .4byte FiveIsland_LostCave_Room14_MapEvents @ 0x83B467C + .4byte FiveIsland_LostCave_Room14_MapScripts @ 0x8164CCE .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 334 diff --git a/data/maps/FiveIsland_LostCave_Room2/header.inc b/data/maps/FiveIsland_LostCave_Room2/header.inc index 3a22600b3..2861812a2 100644 --- a/data/maps/FiveIsland_LostCave_Room2/header.inc +++ b/data/maps/FiveIsland_LostCave_Room2/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room2:: @ 8350110 .4byte FiveIsland_LostCave_Room2_Layout @ 0x8345708 - .4byte gMapEvents_FiveIsland_LostCave_Room2 @ 0x83B43DC - .4byte gMapScripts_FiveIsland_LostCave_Room2 @ 0x8164C0E + .4byte FiveIsland_LostCave_Room2_MapEvents @ 0x83B43DC + .4byte FiveIsland_LostCave_Room2_MapScripts @ 0x8164C0E .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 322 diff --git a/data/maps/FiveIsland_LostCave_Room3/header.inc b/data/maps/FiveIsland_LostCave_Room3/header.inc index 0080d605e..33c5484e0 100644 --- a/data/maps/FiveIsland_LostCave_Room3/header.inc +++ b/data/maps/FiveIsland_LostCave_Room3/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room3:: @ 835012C .4byte FiveIsland_LostCave_Room3_Layout @ 0x8345820 - .4byte gMapEvents_FiveIsland_LostCave_Room3 @ 0x83B4410 - .4byte gMapScripts_FiveIsland_LostCave_Room3 @ 0x8164C0F + .4byte FiveIsland_LostCave_Room3_MapEvents @ 0x83B4410 + .4byte FiveIsland_LostCave_Room3_MapScripts @ 0x8164C0F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 323 diff --git a/data/maps/FiveIsland_LostCave_Room4/header.inc b/data/maps/FiveIsland_LostCave_Room4/header.inc index 019095376..966532b31 100644 --- a/data/maps/FiveIsland_LostCave_Room4/header.inc +++ b/data/maps/FiveIsland_LostCave_Room4/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room4:: @ 8350148 .4byte FiveIsland_LostCave_Room4_Layout @ 0x8345938 - .4byte gMapEvents_FiveIsland_LostCave_Room4 @ 0x83B445C - .4byte gMapScripts_FiveIsland_LostCave_Room4 @ 0x8164C10 + .4byte FiveIsland_LostCave_Room4_MapEvents @ 0x83B445C + .4byte FiveIsland_LostCave_Room4_MapScripts @ 0x8164C10 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 324 diff --git a/data/maps/FiveIsland_LostCave_Room5/header.inc b/data/maps/FiveIsland_LostCave_Room5/header.inc index e5bc7e389..6ec15156f 100644 --- a/data/maps/FiveIsland_LostCave_Room5/header.inc +++ b/data/maps/FiveIsland_LostCave_Room5/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room5:: @ 8350164 .4byte FiveIsland_LostCave_Room5_Layout @ 0x8345A50 - .4byte gMapEvents_FiveIsland_LostCave_Room5 @ 0x83B4490 - .4byte gMapScripts_FiveIsland_LostCave_Room5 @ 0x8164C28 + .4byte FiveIsland_LostCave_Room5_MapEvents @ 0x83B4490 + .4byte FiveIsland_LostCave_Room5_MapScripts @ 0x8164C28 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 325 diff --git a/data/maps/FiveIsland_LostCave_Room6/header.inc b/data/maps/FiveIsland_LostCave_Room6/header.inc index 5688b9428..c45b08d1e 100644 --- a/data/maps/FiveIsland_LostCave_Room6/header.inc +++ b/data/maps/FiveIsland_LostCave_Room6/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room6:: @ 8350180 .4byte FiveIsland_LostCave_Room6_Layout @ 0x8345B68 - .4byte gMapEvents_FiveIsland_LostCave_Room6 @ 0x83B44C4 - .4byte gMapScripts_FiveIsland_LostCave_Room6 @ 0x8164C29 + .4byte FiveIsland_LostCave_Room6_MapEvents @ 0x83B44C4 + .4byte FiveIsland_LostCave_Room6_MapScripts @ 0x8164C29 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 326 diff --git a/data/maps/FiveIsland_LostCave_Room7/header.inc b/data/maps/FiveIsland_LostCave_Room7/header.inc index eff6b2b3b..17a168e1d 100644 --- a/data/maps/FiveIsland_LostCave_Room7/header.inc +++ b/data/maps/FiveIsland_LostCave_Room7/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room7:: @ 835019C .4byte FiveIsland_LostCave_Room7_Layout @ 0x8345C80 - .4byte gMapEvents_FiveIsland_LostCave_Room7 @ 0x83B44F8 - .4byte gMapScripts_FiveIsland_LostCave_Room7 @ 0x8164C2A + .4byte FiveIsland_LostCave_Room7_MapEvents @ 0x83B44F8 + .4byte FiveIsland_LostCave_Room7_MapScripts @ 0x8164C2A .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 327 diff --git a/data/maps/FiveIsland_LostCave_Room8/header.inc b/data/maps/FiveIsland_LostCave_Room8/header.inc index 585e219ee..21fa63267 100644 --- a/data/maps/FiveIsland_LostCave_Room8/header.inc +++ b/data/maps/FiveIsland_LostCave_Room8/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room8:: @ 83501B8 .4byte FiveIsland_LostCave_Room8_Layout @ 0x8345D98 - .4byte gMapEvents_FiveIsland_LostCave_Room8 @ 0x83B452C - .4byte gMapScripts_FiveIsland_LostCave_Room8 @ 0x8164C2B + .4byte FiveIsland_LostCave_Room8_MapEvents @ 0x83B452C + .4byte FiveIsland_LostCave_Room8_MapScripts @ 0x8164C2B .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 328 diff --git a/data/maps/FiveIsland_LostCave_Room9/header.inc b/data/maps/FiveIsland_LostCave_Room9/header.inc index 2c465cf0e..53ef0c34e 100644 --- a/data/maps/FiveIsland_LostCave_Room9/header.inc +++ b/data/maps/FiveIsland_LostCave_Room9/header.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room9:: @ 83501D4 .4byte FiveIsland_LostCave_Room9_Layout @ 0x8345EB0 - .4byte gMapEvents_FiveIsland_LostCave_Room9 @ 0x83B4560 - .4byte gMapScripts_FiveIsland_LostCave_Room9 @ 0x8164C2C + .4byte FiveIsland_LostCave_Room9_MapEvents @ 0x83B4560 + .4byte FiveIsland_LostCave_Room9_MapScripts @ 0x8164C2C .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 329 diff --git a/data/maps/FiveIsland_Meadow/header.inc b/data/maps/FiveIsland_Meadow/header.inc index 05ba4c525..4f30d8ae1 100644 --- a/data/maps/FiveIsland_Meadow/header.inc +++ b/data/maps/FiveIsland_Meadow/header.inc @@ -1,7 +1,7 @@ FiveIsland_Meadow:: @ 8350C38 .4byte FiveIsland_Meadow_Layout @ 0x832BAE4 - .4byte gMapEvents_FiveIsland_Meadow @ 0x83B8D94 - .4byte gMapScripts_FiveIsland_Meadow @ 0x8168932 + .4byte FiveIsland_Meadow_MapEvents @ 0x83B8D94 + .4byte FiveIsland_Meadow_MapScripts @ 0x8168932 .4byte FiveIsland_Meadow_MapConnections @ 0x8352DF4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 248 diff --git a/data/maps/FiveIsland_MemorialPillar/header.inc b/data/maps/FiveIsland_MemorialPillar/header.inc index 0db87e74f..39944fcdf 100644 --- a/data/maps/FiveIsland_MemorialPillar/header.inc +++ b/data/maps/FiveIsland_MemorialPillar/header.inc @@ -1,7 +1,7 @@ FiveIsland_MemorialPillar:: @ 8350C54 .4byte FiveIsland_MemorialPillar_Layout @ 0x832C648 - .4byte gMapEvents_FiveIsland_MemorialPillar @ 0x83B8E5C - .4byte gMapScripts_FiveIsland_MemorialPillar @ 0x81689D2 + .4byte FiveIsland_MemorialPillar_MapEvents @ 0x83B8E5C + .4byte FiveIsland_MemorialPillar_MapScripts @ 0x81689D2 .4byte FiveIsland_MemorialPillar_MapConnections @ 0x8352E08 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 249 diff --git a/data/maps/FiveIsland_PokemonCenter_1F/header.inc b/data/maps/FiveIsland_PokemonCenter_1F/header.inc index 61ceecc1e..ed32a33e9 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/header.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FiveIsland_PokemonCenter_1F:: @ 8351E44 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FiveIsland_PokemonCenter_1F @ 0x83BEEDC - .4byte gMapScripts_FiveIsland_PokemonCenter_1F @ 0x8171CF1 + .4byte FiveIsland_PokemonCenter_1F_MapEvents @ 0x83BEEDC + .4byte FiveIsland_PokemonCenter_1F_MapScripts @ 0x8171CF1 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FiveIsland_PokemonCenter_2F/header.inc b/data/maps/FiveIsland_PokemonCenter_2F/header.inc index a3f51f119..fd00cabd4 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/header.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FiveIsland_PokemonCenter_2F:: @ 8351E60 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FiveIsland_PokemonCenter_2F @ 0x83BEF68 - .4byte gMapScripts_FiveIsland_PokemonCenter_2F @ 0x8171D1B + .4byte FiveIsland_PokemonCenter_2F_MapEvents @ 0x83BEF68 + .4byte FiveIsland_PokemonCenter_2F_MapScripts @ 0x8171D1B .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FiveIsland_ResortGorgeous/header.inc b/data/maps/FiveIsland_ResortGorgeous/header.inc index 13c3647f7..ecbc20c6d 100644 --- a/data/maps/FiveIsland_ResortGorgeous/header.inc +++ b/data/maps/FiveIsland_ResortGorgeous/header.inc @@ -1,7 +1,7 @@ FiveIsland_ResortGorgeous:: @ 8350C00 .4byte FiveIsland_ResortGorgeous_Layout @ 0x832A7DC - .4byte gMapEvents_FiveIsland_ResortGorgeous @ 0x83B8C80 - .4byte gMapScripts_FiveIsland_ResortGorgeous @ 0x81687E4 + .4byte FiveIsland_ResortGorgeous_MapEvents @ 0x83B8C80 + .4byte FiveIsland_ResortGorgeous_MapScripts @ 0x81687E4 .4byte FiveIsland_ResortGorgeous_MapConnections @ 0x8352DB4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 246 diff --git a/data/maps/FiveIsland_ResortGorgeous_House/header.inc b/data/maps/FiveIsland_ResortGorgeous_House/header.inc index 06e2fb981..9ef744a47 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/header.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/header.inc @@ -1,7 +1,7 @@ FiveIsland_ResortGorgeous_House:: @ 8351F78 .4byte FiveIsland_ResortGorgeous_House_Layout @ 0x82D657C - .4byte gMapEvents_FiveIsland_ResortGorgeous_House @ 0x83BF2C0 - .4byte gMapScripts_FiveIsland_ResortGorgeous_House @ 0x8171EBD + .4byte FiveIsland_ResortGorgeous_House_MapEvents @ 0x83BF2C0 + .4byte FiveIsland_ResortGorgeous_House_MapScripts @ 0x8171EBD .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 17 diff --git a/data/maps/FiveIsland_WaterLabyrinth/header.inc b/data/maps/FiveIsland_WaterLabyrinth/header.inc index ca762bcd5..9516eb6f8 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/header.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/header.inc @@ -1,7 +1,7 @@ FiveIsland_WaterLabyrinth:: @ 8350C1C .4byte FiveIsland_WaterLabyrinth_Layout @ 0x832B340 - .4byte gMapEvents_FiveIsland_WaterLabyrinth @ 0x83B8CC4 - .4byte gMapScripts_FiveIsland_WaterLabyrinth @ 0x816884D + .4byte FiveIsland_WaterLabyrinth_MapEvents @ 0x83B8CC4 + .4byte FiveIsland_WaterLabyrinth_MapScripts @ 0x816884D .4byte FiveIsland_WaterLabyrinth_MapConnections @ 0x8352DD4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 247 diff --git a/data/maps/FourIsland/header.inc b/data/maps/FourIsland/header.inc index 16949a412..7efe4469f 100644 --- a/data/maps/FourIsland/header.inc +++ b/data/maps/FourIsland/header.inc @@ -1,7 +1,7 @@ FourIsland:: @ 83507BC .4byte FourIsland_Layout @ 0x8323580 - .4byte gMapEvents_FourIsland @ 0x83B646C - .4byte gMapScripts_FourIsland @ 0x8167CAE + .4byte FourIsland_MapEvents @ 0x83B646C + .4byte FourIsland_MapScripts @ 0x8167CAE .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 233 diff --git a/data/maps/FourIsland_Harbor/header.inc b/data/maps/FourIsland_Harbor/header.inc index 224d88240..af0f40483 100644 --- a/data/maps/FourIsland_Harbor/header.inc +++ b/data/maps/FourIsland_Harbor/header.inc @@ -1,7 +1,7 @@ FourIsland_Harbor:: @ 8351DF0 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_FourIsland_Harbor @ 0x83BEDA8 - .4byte gMapScripts_FourIsland_Harbor @ 0x8171C98 + .4byte FourIsland_Harbor_MapEvents @ 0x83BEDA8 + .4byte FourIsland_Harbor_MapScripts @ 0x8171C98 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 315 diff --git a/data/maps/FourIsland_House1/header.inc b/data/maps/FourIsland_House1/header.inc index b72ce9938..6f2cf1099 100644 --- a/data/maps/FourIsland_House1/header.inc +++ b/data/maps/FourIsland_House1/header.inc @@ -1,7 +1,7 @@ FourIsland_House1:: @ 8351DB8 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FourIsland_House1 @ 0x83BEBD8 - .4byte gMapScripts_FourIsland_House1 @ 0x8171C44 + .4byte FourIsland_House1_MapEvents @ 0x83BEBD8 + .4byte FourIsland_House1_MapScripts @ 0x8171C44 .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FourIsland_House2/header.inc b/data/maps/FourIsland_House2/header.inc index fafd19dde..699623002 100644 --- a/data/maps/FourIsland_House2/header.inc +++ b/data/maps/FourIsland_House2/header.inc @@ -1,7 +1,7 @@ FourIsland_House2:: @ 8351E0C .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_FourIsland_House2 @ 0x83BEDDC - .4byte gMapScripts_FourIsland_House2 @ 0x8171CAC + .4byte FourIsland_House2_MapEvents @ 0x83BEDDC + .4byte FourIsland_House2_MapScripts @ 0x8171CAC .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 11 diff --git a/data/maps/FourIsland_IcefallCave_1F/header.inc b/data/maps/FourIsland_IcefallCave_1F/header.inc index 8a4ad3c55..a77f235f9 100644 --- a/data/maps/FourIsland_IcefallCave_1F/header.inc +++ b/data/maps/FourIsland_IcefallCave_1F/header.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_1F:: @ 834FE38 .4byte FourIsland_IcefallCave_1F_Layout @ 0x834117C - .4byte gMapEvents_FourIsland_IcefallCave_1F @ 0x83B34AC - .4byte gMapScripts_FourIsland_IcefallCave_1F @ 0x8163D44 + .4byte FourIsland_IcefallCave_1F_MapEvents @ 0x83B34AC + .4byte FourIsland_IcefallCave_1F_MapScripts @ 0x8163D44 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 294 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/header.inc b/data/maps/FourIsland_IcefallCave_Entrance/header.inc index 9c183603b..758df55d9 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/header.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/header.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_Entrance:: @ 834FE1C .4byte FourIsland_IcefallCave_Entrance_Layout @ 0x8340E38 - .4byte gMapEvents_FourIsland_IcefallCave_Entrance @ 0x83B3438 - .4byte gMapScripts_FourIsland_IcefallCave_Entrance @ 0x8163D3A + .4byte FourIsland_IcefallCave_Entrance_MapEvents @ 0x83B3438 + .4byte FourIsland_IcefallCave_Entrance_MapScripts @ 0x8163D3A .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 293 diff --git a/data/maps/FourIsland_LoreleisHouse/header.inc b/data/maps/FourIsland_LoreleisHouse/header.inc index 112231426..70bb32a5d 100644 --- a/data/maps/FourIsland_LoreleisHouse/header.inc +++ b/data/maps/FourIsland_LoreleisHouse/header.inc @@ -1,7 +1,7 @@ FourIsland_LoreleisHouse:: @ 8351DD4 .4byte FourIsland_LoreleisHouse_Layout @ 0x82D7418 - .4byte gMapEvents_FourIsland_LoreleisHouse @ 0x83BED5C - .4byte gMapScripts_FourIsland_LoreleisHouse @ 0x8171C4E + .4byte FourIsland_LoreleisHouse_MapEvents @ 0x83BED5C + .4byte FourIsland_LoreleisHouse_MapScripts @ 0x8171C4E .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 30 diff --git a/data/maps/FourIsland_Mart/header.inc b/data/maps/FourIsland_Mart/header.inc index 634c598fc..95c316e9a 100644 --- a/data/maps/FourIsland_Mart/header.inc +++ b/data/maps/FourIsland_Mart/header.inc @@ -1,7 +1,7 @@ FourIsland_Mart:: @ 8351E28 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_FourIsland_Mart @ 0x83BEE40 - .4byte gMapScripts_FourIsland_Mart @ 0x8171CAD + .4byte FourIsland_Mart_MapEvents @ 0x83BEE40 + .4byte FourIsland_Mart_MapScripts @ 0x8171CAD .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/FourIsland_PokemonCenter_1F/header.inc b/data/maps/FourIsland_PokemonCenter_1F/header.inc index 151688304..917d92aaf 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/header.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonCenter_1F:: @ 8351D80 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FourIsland_PokemonCenter_1F @ 0x83BEB00 - .4byte gMapScripts_FourIsland_PokemonCenter_1F @ 0x8171BEA + .4byte FourIsland_PokemonCenter_1F_MapEvents @ 0x83BEB00 + .4byte FourIsland_PokemonCenter_1F_MapScripts @ 0x8171BEA .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FourIsland_PokemonCenter_2F/header.inc b/data/maps/FourIsland_PokemonCenter_2F/header.inc index c79978793..839d75196 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/header.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonCenter_2F:: @ 8351D9C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FourIsland_PokemonCenter_2F @ 0x83BEB8C - .4byte gMapScripts_FourIsland_PokemonCenter_2F @ 0x8171C1D + .4byte FourIsland_PokemonCenter_2F_MapEvents @ 0x83BEB8C + .4byte FourIsland_PokemonCenter_2F_MapScripts @ 0x8171C1D .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FourIsland_PokemonDayCare/header.inc b/data/maps/FourIsland_PokemonDayCare/header.inc index 31aa92deb..7cea7eaa5 100644 --- a/data/maps/FourIsland_PokemonDayCare/header.inc +++ b/data/maps/FourIsland_PokemonDayCare/header.inc @@ -1,7 +1,7 @@ FourIsland_PokemonDayCare:: @ 8351D64 .4byte FourIsland_PokemonDayCare_Layout @ 0x833AFA8 - .4byte gMapEvents_FourIsland_PokemonDayCare @ 0x83BEA64 - .4byte gMapScripts_FourIsland_PokemonDayCare @ 0x817193F + .4byte FourIsland_PokemonDayCare_MapEvents @ 0x83BEA64 + .4byte FourIsland_PokemonDayCare_MapScripts @ 0x817193F .4byte NULL .2byte BGM_FRLG_ISLAND_FOUR .2byte 277 diff --git a/data/maps/FuchsiaCity/header.inc b/data/maps/FuchsiaCity/header.inc index 8017613bc..b4a33e9c5 100644 --- a/data/maps/FuchsiaCity/header.inc +++ b/data/maps/FuchsiaCity/header.inc @@ -1,7 +1,7 @@ FuchsiaCity:: @ 83506DC .4byte FuchsiaCity_Layout @ 0x82E373C - .4byte gMapEvents_FuchsiaCity @ 0x83B5B14 - .4byte gMapScripts_FuchsiaCity @ 0x8166D75 + .4byte FuchsiaCity_MapEvents @ 0x83B5B14 + .4byte FuchsiaCity_MapScripts @ 0x8166D75 .4byte FuchsiaCity_MapConnections @ 0x8352888 .2byte BGM_FRLG_CERULEAN_CITY .2byte 85 diff --git a/data/maps/FuchsiaCity_Building1/header.inc b/data/maps/FuchsiaCity_Building1/header.inc index db876f27c..f598da548 100644 --- a/data/maps/FuchsiaCity_Building1/header.inc +++ b/data/maps/FuchsiaCity_Building1/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Building1:: @ 83514DC .4byte FuchsiaCity_Building1_Layout @ 0x831C48C - .4byte gMapEvents_FuchsiaCity_Building1 @ 0x83BC3F4 - .4byte gMapScripts_FuchsiaCity_Building1 @ 0x816D74B + .4byte FuchsiaCity_Building1_MapEvents @ 0x83BC3F4 + .4byte FuchsiaCity_Building1_MapScripts @ 0x816D74B .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 201 diff --git a/data/maps/FuchsiaCity_Gym/header.inc b/data/maps/FuchsiaCity_Gym/header.inc index ed9dfef9e..16aeeb007 100644 --- a/data/maps/FuchsiaCity_Gym/header.inc +++ b/data/maps/FuchsiaCity_Gym/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Gym:: @ 835146C .4byte FuchsiaCity_Gym_Layout @ 0x82D6A04 - .4byte gMapEvents_FuchsiaCity_Gym @ 0x83BC1A4 - .4byte gMapScripts_FuchsiaCity_Gym @ 0x816D54D + .4byte FuchsiaCity_Gym_MapEvents @ 0x83BC1A4 + .4byte FuchsiaCity_Gym_MapScripts @ 0x816D54D .4byte NULL .2byte BGM_FRLG_GYM .2byte 20 diff --git a/data/maps/FuchsiaCity_House1/header.inc b/data/maps/FuchsiaCity_House1/header.inc index ced57d5dd..018383387 100644 --- a/data/maps/FuchsiaCity_House1/header.inc +++ b/data/maps/FuchsiaCity_House1/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House1:: @ 8351488 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_FuchsiaCity_House1 @ 0x83BC218 - .4byte gMapScripts_FuchsiaCity_House1 @ 0x816D6C5 + .4byte FuchsiaCity_House1_MapEvents @ 0x83BC218 + .4byte FuchsiaCity_House1_MapScripts @ 0x816D6C5 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/FuchsiaCity_House2/header.inc b/data/maps/FuchsiaCity_House2/header.inc index 7dbe95373..6bedf2ac0 100644 --- a/data/maps/FuchsiaCity_House2/header.inc +++ b/data/maps/FuchsiaCity_House2/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House2:: @ 83514F8 .4byte FuchsiaCity_House2_Layout @ 0x831C578 - .4byte gMapEvents_FuchsiaCity_House2 @ 0x83BC440 - .4byte gMapScripts_FuchsiaCity_House2 @ 0x816D816 + .4byte FuchsiaCity_House2_MapEvents @ 0x83BC440 + .4byte FuchsiaCity_House2_MapScripts @ 0x816D816 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 202 diff --git a/data/maps/FuchsiaCity_House3/header.inc b/data/maps/FuchsiaCity_House3/header.inc index 6cd078957..3b4f76d09 100644 --- a/data/maps/FuchsiaCity_House3/header.inc +++ b/data/maps/FuchsiaCity_House3/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_House3:: @ 8351514 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_FuchsiaCity_House3 @ 0x83BC474 - .4byte gMapScripts_FuchsiaCity_House3 @ 0x816D894 + .4byte FuchsiaCity_House3_MapEvents @ 0x83BC474 + .4byte FuchsiaCity_House3_MapScripts @ 0x816D894 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/FuchsiaCity_Mart/header.inc b/data/maps/FuchsiaCity_Mart/header.inc index 7e3661618..705b0f301 100644 --- a/data/maps/FuchsiaCity_Mart/header.inc +++ b/data/maps/FuchsiaCity_Mart/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_Mart:: @ 8351434 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_FuchsiaCity_Mart @ 0x83BC014 - .4byte gMapScripts_FuchsiaCity_Mart @ 0x816D4E0 + .4byte FuchsiaCity_Mart_MapEvents @ 0x83BC014 + .4byte FuchsiaCity_Mart_MapScripts @ 0x816D4E0 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc index da90f4470..2d88508c4 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_PokemonCenter_1F:: @ 83514A4 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_FuchsiaCity_PokemonCenter_1F @ 0x83BC2AC - .4byte gMapScripts_FuchsiaCity_PokemonCenter_1F @ 0x816D6F1 + .4byte FuchsiaCity_PokemonCenter_1F_MapEvents @ 0x83BC2AC + .4byte FuchsiaCity_PokemonCenter_1F_MapScripts @ 0x816D6F1 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc index 890dc2977..6beffe603 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_PokemonCenter_2F:: @ 83514C0 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_FuchsiaCity_PokemonCenter_2F @ 0x83BC338 - .4byte gMapScripts_FuchsiaCity_PokemonCenter_2F @ 0x816D724 + .4byte FuchsiaCity_PokemonCenter_2F_MapEvents @ 0x83BC338 + .4byte FuchsiaCity_PokemonCenter_2F_MapScripts @ 0x816D724 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc index f83a6b62f..7bfaeb1ec 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_SafariZone_Entrance:: @ 8351418 .4byte FuchsiaCity_SafariZone_Entrance_Layout @ 0x82D8E80 - .4byte gMapEvents_FuchsiaCity_SafariZone_Entrance @ 0x83BBFA0 - .4byte gMapScripts_FuchsiaCity_SafariZone_Entrance @ 0x816D2A8 + .4byte FuchsiaCity_SafariZone_Entrance_MapEvents @ 0x83BBFA0 + .4byte FuchsiaCity_SafariZone_Entrance_MapScripts @ 0x816D2A8 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 51 diff --git a/data/maps/FuchsiaCity_ZooBuilding/header.inc b/data/maps/FuchsiaCity_ZooBuilding/header.inc index a47f66952..e5ad3ae0c 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/header.inc +++ b/data/maps/FuchsiaCity_ZooBuilding/header.inc @@ -1,7 +1,7 @@ FuchsiaCity_ZooBuilding:: @ 8351450 .4byte FuchsiaCity_ZooBuilding_Layout @ 0x831C348 - .4byte gMapEvents_FuchsiaCity_ZooBuilding @ 0x83BC0A0 - .4byte gMapScripts_FuchsiaCity_ZooBuilding @ 0x816D528 + .4byte FuchsiaCity_ZooBuilding_MapEvents @ 0x83BC0A0 + .4byte FuchsiaCity_ZooBuilding_MapScripts @ 0x816D528 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 200 diff --git a/data/maps/IndigoPlateau_Exterior/header.inc b/data/maps/IndigoPlateau_Exterior/header.inc index f6d13a5f5..c40993e89 100644 --- a/data/maps/IndigoPlateau_Exterior/header.inc +++ b/data/maps/IndigoPlateau_Exterior/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_Exterior:: @ 8350714 .4byte IndigoPlateau_Exterior_Layout @ 0x82E3F04 - .4byte gMapEvents_IndigoPlateau_Exterior @ 0x83B5C3C - .4byte gMapScripts_IndigoPlateau_Exterior @ 0x816723B + .4byte IndigoPlateau_Exterior_MapEvents @ 0x83B5C3C + .4byte IndigoPlateau_Exterior_MapScripts @ 0x816723B .4byte IndigoPlateau_Exterior_MapConnections @ 0x83528BC .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 87 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc index 48d8200cd..bb16f0475 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_PokemonCenter_1F:: @ 8351610 .4byte IndigoPlateau_PokemonCenter_1F_Layout @ 0x831F000 - .4byte gMapEvents_IndigoPlateau_PokemonCenter_1F @ 0x83BCA94 - .4byte gMapScripts_IndigoPlateau_PokemonCenter_1F @ 0x816EA5A + .4byte IndigoPlateau_PokemonCenter_1F_MapEvents @ 0x83BCA94 + .4byte IndigoPlateau_PokemonCenter_1F_MapScripts @ 0x816EA5A .4byte NULL .2byte BGM_FRLG_GYM .2byte 212 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc index 9b88ab689..604c361d8 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ IndigoPlateau_PokemonCenter_2F:: @ 835162C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_IndigoPlateau_PokemonCenter_2F @ 0x83BCB20 - .4byte gMapScripts_IndigoPlateau_PokemonCenter_2F @ 0x816EB0F + .4byte IndigoPlateau_PokemonCenter_2F_MapEvents @ 0x83BCB20 + .4byte IndigoPlateau_PokemonCenter_2F_MapScripts @ 0x816EB0F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/LavenderTown/header.inc b/data/maps/LavenderTown/header.inc index ba459c4ac..24913dc46 100644 --- a/data/maps/LavenderTown/header.inc +++ b/data/maps/LavenderTown/header.inc @@ -1,7 +1,7 @@ LavenderTown:: @ 8350688 .4byte LavenderTown_Layout @ 0x82E0610 - .4byte gMapEvents_LavenderTown @ 0x83B549C - .4byte gMapScripts_LavenderTown @ 0x816686B + .4byte LavenderTown_MapEvents @ 0x83B549C + .4byte LavenderTown_MapScripts @ 0x816686B .4byte LavenderTown_MapConnections @ 0x835281C .2byte BGM_FRLG_LAVENDER_TOWN .2byte 82 diff --git a/data/maps/LavenderTown_House1/header.inc b/data/maps/LavenderTown_House1/header.inc index 1ce5034eb..5c11f9ff5 100644 --- a/data/maps/LavenderTown_House1/header.inc +++ b/data/maps/LavenderTown_House1/header.inc @@ -1,7 +1,7 @@ LavenderTown_House1:: @ 83510B4 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_LavenderTown_House1 @ 0x83BAA58 - .4byte gMapScripts_LavenderTown_House1 @ 0x816B232 + .4byte LavenderTown_House1_MapEvents @ 0x83BAA58 + .4byte LavenderTown_House1_MapScripts @ 0x816B232 .4byte NULL .2byte BGM_FRLG_LAVENDER_TOWN .2byte 21 diff --git a/data/maps/LavenderTown_House2/header.inc b/data/maps/LavenderTown_House2/header.inc index 87ec9bcde..30f103a05 100644 --- a/data/maps/LavenderTown_House2/header.inc +++ b/data/maps/LavenderTown_House2/header.inc @@ -1,7 +1,7 @@ LavenderTown_House2:: @ 83510D0 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_LavenderTown_House2 @ 0x83BAA9C - .4byte gMapScripts_LavenderTown_House2 @ 0x816B265 + .4byte LavenderTown_House2_MapEvents @ 0x83BAA9C + .4byte LavenderTown_House2_MapScripts @ 0x816B265 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 21 diff --git a/data/maps/LavenderTown_Mart/header.inc b/data/maps/LavenderTown_Mart/header.inc index 593229dc4..848c25d72 100644 --- a/data/maps/LavenderTown_Mart/header.inc +++ b/data/maps/LavenderTown_Mart/header.inc @@ -1,7 +1,7 @@ LavenderTown_Mart:: @ 83510EC .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_LavenderTown_Mart @ 0x83BAB28 - .4byte gMapScripts_LavenderTown_Mart @ 0x816B34F + .4byte LavenderTown_Mart_MapEvents @ 0x83BAB28 + .4byte LavenderTown_Mart_MapScripts @ 0x816B34F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/header.inc b/data/maps/LavenderTown_PokemonCenter_1F/header.inc index 65952d0a1..ecf848112 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ LavenderTown_PokemonCenter_1F:: @ 8351060 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_LavenderTown_PokemonCenter_1F @ 0x83BA890 - .4byte gMapScripts_LavenderTown_PokemonCenter_1F @ 0x816B0EF + .4byte LavenderTown_PokemonCenter_1F_MapEvents @ 0x83BA890 + .4byte LavenderTown_PokemonCenter_1F_MapScripts @ 0x816B0EF .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/LavenderTown_PokemonCenter_2F/header.inc b/data/maps/LavenderTown_PokemonCenter_2F/header.inc index 81e4c42e5..99713d4c8 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ LavenderTown_PokemonCenter_2F:: @ 835107C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_LavenderTown_PokemonCenter_2F @ 0x83BA91C - .4byte gMapScripts_LavenderTown_PokemonCenter_2F @ 0x816B122 + .4byte LavenderTown_PokemonCenter_2F_MapEvents @ 0x83BA91C + .4byte LavenderTown_PokemonCenter_2F_MapScripts @ 0x816B122 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc index 2d58479f3..b10a4798f 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/header.inc @@ -1,7 +1,7 @@ LavenderTown_VolunteerPokemonHouse:: @ 8351098 .4byte LavenderTown_VolunteerPokemonHouse_Layout @ 0x833ACC4 - .4byte gMapEvents_LavenderTown_VolunteerPokemonHouse @ 0x83BA9FC - .4byte gMapScripts_LavenderTown_VolunteerPokemonHouse @ 0x816B149 + .4byte LavenderTown_VolunteerPokemonHouse_MapEvents @ 0x83BA9FC + .4byte LavenderTown_VolunteerPokemonHouse_MapScripts @ 0x816B149 .4byte NULL .2byte BGM_FRLG_LAVENDER_TOWN .2byte 274 diff --git a/data/maps/MtEmber_Exterior/header.inc b/data/maps/MtEmber_Exterior/header.inc index ef95fc172..8d43c8d97 100644 --- a/data/maps/MtEmber_Exterior/header.inc +++ b/data/maps/MtEmber_Exterior/header.inc @@ -1,7 +1,7 @@ MtEmber_Exterior:: @ 834FCB0 .4byte MtEmber_Exterior_Layout @ 0x833D660 - .4byte gMapEvents_MtEmber_Exterior @ 0x83B2C24 - .4byte gMapScripts_MtEmber_Exterior @ 0x8163946 + .4byte MtEmber_Exterior_MapEvents @ 0x83B2C24 + .4byte MtEmber_Exterior_MapScripts @ 0x8163946 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 280 diff --git a/data/maps/MtEmber_RubyPath_B1F/header.inc b/data/maps/MtEmber_RubyPath_B1F/header.inc index bf10f81e3..659721b8b 100644 --- a/data/maps/MtEmber_RubyPath_B1F/header.inc +++ b/data/maps/MtEmber_RubyPath_B1F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B1F:: @ 834FD74 .4byte MtEmber_RubyPath_B1F_Layout @ 0x833F524 - .4byte gMapEvents_MtEmber_RubyPath_B1F @ 0x83B2F64 - .4byte gMapScripts_MtEmber_RubyPath_B1F @ 0x8163C46 + .4byte MtEmber_RubyPath_B1F_MapEvents @ 0x83B2F64 + .4byte MtEmber_RubyPath_B1F_MapScripts @ 0x8163C46 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 286 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc index 8da609b21..605a4c539 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B1F_Stairs:: @ 834FDC8 .4byte MtEmber_RubyPath_B1F_Stairs_Layout @ 0x833FCD8 - .4byte gMapEvents_MtEmber_RubyPath_B1F_Stairs @ 0x83B3188 - .4byte gMapScripts_MtEmber_RubyPath_B1F_Stairs @ 0x8163C6F + .4byte MtEmber_RubyPath_B1F_Stairs_MapEvents @ 0x83B3188 + .4byte MtEmber_RubyPath_B1F_Stairs_MapScripts @ 0x8163C6F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 289 diff --git a/data/maps/MtEmber_RubyPath_B2F/header.inc b/data/maps/MtEmber_RubyPath_B2F/header.inc index f390388e4..817cf2e47 100644 --- a/data/maps/MtEmber_RubyPath_B2F/header.inc +++ b/data/maps/MtEmber_RubyPath_B2F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B2F:: @ 834FD90 .4byte MtEmber_RubyPath_B2F_Layout @ 0x833F6A8 - .4byte gMapEvents_MtEmber_RubyPath_B2F @ 0x83B3030 - .4byte gMapScripts_MtEmber_RubyPath_B2F @ 0x8163C47 + .4byte MtEmber_RubyPath_B2F_MapEvents @ 0x83B3030 + .4byte MtEmber_RubyPath_B2F_MapScripts @ 0x8163C47 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 287 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc index 1b502c77b..875d1f224 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B2F_Stairs:: @ 834FDE4 .4byte MtEmber_RubyPath_B2F_Stairs_Layout @ 0x833FD5C - .4byte gMapEvents_MtEmber_RubyPath_B2F_Stairs @ 0x83B31DC - .4byte gMapScripts_MtEmber_RubyPath_B2F_Stairs @ 0x8163C70 + .4byte MtEmber_RubyPath_B2F_Stairs_MapEvents @ 0x83B31DC + .4byte MtEmber_RubyPath_B2F_Stairs_MapScripts @ 0x8163C70 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 290 diff --git a/data/maps/MtEmber_RubyPath_B3F/header.inc b/data/maps/MtEmber_RubyPath_B3F/header.inc index d0936221e..bcf17a29f 100644 --- a/data/maps/MtEmber_RubyPath_B3F/header.inc +++ b/data/maps/MtEmber_RubyPath_B3F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B3F:: @ 834FDAC .4byte MtEmber_RubyPath_B3F_Layout @ 0x833FC60 - .4byte gMapEvents_MtEmber_RubyPath_B3F @ 0x83B314C - .4byte gMapScripts_MtEmber_RubyPath_B3F @ 0x8163C48 + .4byte MtEmber_RubyPath_B3F_MapEvents @ 0x83B314C + .4byte MtEmber_RubyPath_B3F_MapScripts @ 0x8163C48 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 288 diff --git a/data/maps/MtEmber_RubyPath_B4F/header.inc b/data/maps/MtEmber_RubyPath_B4F/header.inc index b91482b18..e6c316632 100644 --- a/data/maps/MtEmber_RubyPath_B4F/header.inc +++ b/data/maps/MtEmber_RubyPath_B4F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B4F:: @ 834FC94 .4byte MtEmber_RubyPath_B4F_Layout @ 0x8339290 - .4byte gMapEvents_MtEmber_RubyPath_B4F @ 0x83B29B8 - .4byte gMapScripts_MtEmber_RubyPath_B4F @ 0x81638EB + .4byte MtEmber_RubyPath_B4F_MapEvents @ 0x83B29B8 + .4byte MtEmber_RubyPath_B4F_MapScripts @ 0x81638EB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 269 diff --git a/data/maps/MtEmber_RubyPath_B5F/header.inc b/data/maps/MtEmber_RubyPath_B5F/header.inc index 1a351c127..8fbb65498 100644 --- a/data/maps/MtEmber_RubyPath_B5F/header.inc +++ b/data/maps/MtEmber_RubyPath_B5F/header.inc @@ -1,7 +1,7 @@ MtEmber_RubyPath_B5F:: @ 834FD3C .4byte MtEmber_RubyPath_B5F_Layout @ 0x833FF60 - .4byte gMapEvents_MtEmber_RubyPath_B5F @ 0x83B2E3C - .4byte gMapScripts_MtEmber_RubyPath_B5F @ 0x8163BAA + .4byte MtEmber_RubyPath_B5F_MapEvents @ 0x83B2E3C + .4byte MtEmber_RubyPath_B5F_MapScripts @ 0x8163BAA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 291 diff --git a/data/maps/MtEmber_Summit/header.inc b/data/maps/MtEmber_Summit/header.inc index 367a35294..64c30d948 100644 --- a/data/maps/MtEmber_Summit/header.inc +++ b/data/maps/MtEmber_Summit/header.inc @@ -1,7 +1,7 @@ MtEmber_Summit:: @ 834FD20 .4byte MtEmber_Summit_Layout @ 0x833D9C8 - .4byte gMapEvents_MtEmber_Summit @ 0x83B2DFC - .4byte gMapScripts_MtEmber_Summit @ 0x8163AFC + .4byte MtEmber_Summit_MapEvents @ 0x83B2DFC + .4byte MtEmber_Summit_MapScripts @ 0x8163AFC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 281 diff --git a/data/maps/MtEmber_SummitPath_1F/header.inc b/data/maps/MtEmber_SummitPath_1F/header.inc index 0ea8992a8..380374d2d 100644 --- a/data/maps/MtEmber_SummitPath_1F/header.inc +++ b/data/maps/MtEmber_SummitPath_1F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_1F:: @ 834FCCC .4byte MtEmber_SummitPath_1F_Layout @ 0x833DC08 - .4byte gMapEvents_MtEmber_SummitPath_1F @ 0x83B2C48 - .4byte gMapScripts_MtEmber_SummitPath_1F @ 0x8163AF9 + .4byte MtEmber_SummitPath_1F_MapEvents @ 0x83B2C48 + .4byte MtEmber_SummitPath_1F_MapScripts @ 0x8163AF9 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 282 diff --git a/data/maps/MtEmber_SummitPath_2F/header.inc b/data/maps/MtEmber_SummitPath_2F/header.inc index 503410f81..b53170ef8 100644 --- a/data/maps/MtEmber_SummitPath_2F/header.inc +++ b/data/maps/MtEmber_SummitPath_2F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_2F:: @ 834FCE8 .4byte MtEmber_SummitPath_2F_Layout @ 0x833ED6C - .4byte gMapEvents_MtEmber_SummitPath_2F @ 0x83B2D44 - .4byte gMapScripts_MtEmber_SummitPath_2F @ 0x8163AFA + .4byte MtEmber_SummitPath_2F_MapEvents @ 0x83B2D44 + .4byte MtEmber_SummitPath_2F_MapScripts @ 0x8163AFA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 283 diff --git a/data/maps/MtEmber_SummitPath_3F/header.inc b/data/maps/MtEmber_SummitPath_3F/header.inc index 35170cadb..0d6829bab 100644 --- a/data/maps/MtEmber_SummitPath_3F/header.inc +++ b/data/maps/MtEmber_SummitPath_3F/header.inc @@ -1,7 +1,7 @@ MtEmber_SummitPath_3F:: @ 834FD04 .4byte MtEmber_SummitPath_3F_Layout @ 0x833EEDC - .4byte gMapEvents_MtEmber_SummitPath_3F @ 0x83B2D68 - .4byte gMapScripts_MtEmber_SummitPath_3F @ 0x8163AFB + .4byte MtEmber_SummitPath_3F_MapEvents @ 0x83B2D68 + .4byte MtEmber_SummitPath_3F_MapScripts @ 0x8163AFB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 284 diff --git a/data/maps/MtMoon_1F/header.inc b/data/maps/MtMoon_1F/header.inc index 3c5cd8a69..13f9175f3 100644 --- a/data/maps/MtMoon_1F/header.inc +++ b/data/maps/MtMoon_1F/header.inc @@ -1,7 +1,7 @@ MtMoon_1F:: @ 834F230 .4byte MtMoon_1F_Layout @ 0x82FA890 - .4byte gMapEvents_MtMoon_1F @ 0x83AE668 - .4byte gMapScripts_MtMoon_1F @ 0x81605E4 + .4byte MtMoon_1F_MapEvents @ 0x83AE668 + .4byte MtMoon_1F_MapScripts @ 0x81605E4 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 114 diff --git a/data/maps/MtMoon_B1F/header.inc b/data/maps/MtMoon_B1F/header.inc index 718e761e4..83f710180 100644 --- a/data/maps/MtMoon_B1F/header.inc +++ b/data/maps/MtMoon_B1F/header.inc @@ -1,7 +1,7 @@ MtMoon_B1F:: @ 834F24C .4byte MtMoon_B1F_Layout @ 0x82FB804 - .4byte gMapEvents_MtMoon_B1F @ 0x83AE704 - .4byte gMapScripts_MtMoon_B1F @ 0x8160698 + .4byte MtMoon_B1F_MapEvents @ 0x83AE704 + .4byte MtMoon_B1F_MapScripts @ 0x8160698 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 115 diff --git a/data/maps/MtMoon_B2F/header.inc b/data/maps/MtMoon_B2F/header.inc index 90329479b..d84f5a668 100644 --- a/data/maps/MtMoon_B2F/header.inc +++ b/data/maps/MtMoon_B2F/header.inc @@ -1,7 +1,7 @@ MtMoon_B2F:: @ 834F268 .4byte MtMoon_B2F_Layout @ 0x82FC728 - .4byte gMapEvents_MtMoon_B2F @ 0x83AE868 - .4byte gMapScripts_MtMoon_B2F @ 0x8160699 + .4byte MtMoon_B2F_MapEvents @ 0x83AE868 + .4byte MtMoon_B2F_MapScripts @ 0x8160699 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 116 diff --git a/data/maps/NavelRock_1F/header.inc b/data/maps/NavelRock_1F/header.inc index ec20cfcb6..770c47ebc 100644 --- a/data/maps/NavelRock_1F/header.inc +++ b/data/maps/NavelRock_1F/header.inc @@ -1,7 +1,7 @@ NavelRock_1F:: @ 8350378 .4byte NavelRock_1F_Layout @ 0x8348AD4 - .4byte gMapEvents_NavelRock_1F @ 0x83B48E0 - .4byte gMapScripts_NavelRock_1F @ 0x8164F9E + .4byte NavelRock_1F_MapEvents @ 0x83B48E0 + .4byte NavelRock_1F_MapScripts @ 0x8164F9E .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 344 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 433e62694..b9d2192a8 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -1,7 +1,7 @@ NavelRock_B1F:: @ 8350570 .4byte NavelRock_B1F_Layout @ 0x834A210 - .4byte gMapEvents_NavelRock_B1F @ 0x83B4BA4 - .4byte gMapScripts_NavelRock_B1F @ 0x8165201 + .4byte NavelRock_B1F_MapEvents @ 0x83B4BA4 + .4byte NavelRock_B1F_MapScripts @ 0x8165201 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 364 diff --git a/data/maps/NavelRock_Base/header.inc b/data/maps/NavelRock_Base/header.inc index bf472a849..e452edef9 100644 --- a/data/maps/NavelRock_Base/header.inc +++ b/data/maps/NavelRock_Base/header.inc @@ -1,7 +1,7 @@ NavelRock_Base:: @ 83503B0 .4byte NavelRock_Base_Layout @ 0x834929C - .4byte gMapEvents_NavelRock_Base @ 0x83B4964 - .4byte gMapScripts_NavelRock_Base @ 0x81650E7 + .4byte NavelRock_Base_MapEvents @ 0x83B4964 + .4byte NavelRock_Base_MapScripts @ 0x81650E7 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 346 diff --git a/data/maps/NavelRock_BasePath_B10F/header.inc b/data/maps/NavelRock_BasePath_B10F/header.inc index e08eb617b..5354c6f9f 100644 --- a/data/maps/NavelRock_BasePath_B10F/header.inc +++ b/data/maps/NavelRock_BasePath_B10F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B10F:: @ 8350538 .4byte NavelRock_BasePath_B10F_Layout @ 0x8349A0C - .4byte gMapEvents_NavelRock_BasePath_B10F @ 0x83B4B5C - .4byte gMapScripts_NavelRock_BasePath_B10F @ 0x81651FF + .4byte NavelRock_BasePath_B10F_MapEvents @ 0x83B4B5C + .4byte NavelRock_BasePath_B10F_MapScripts @ 0x81651FF .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 360 diff --git a/data/maps/NavelRock_BasePath_B11F/header.inc b/data/maps/NavelRock_BasePath_B11F/header.inc index 5803aa630..395f9d82a 100644 --- a/data/maps/NavelRock_BasePath_B11F/header.inc +++ b/data/maps/NavelRock_BasePath_B11F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B11F:: @ 8350554 .4byte NavelRock_BasePath_B11F_Layout @ 0x8349A94 - .4byte gMapEvents_NavelRock_BasePath_B11F @ 0x83B4B80 - .4byte gMapScripts_NavelRock_BasePath_B11F @ 0x8165200 + .4byte NavelRock_BasePath_B11F_MapEvents @ 0x83B4B80 + .4byte NavelRock_BasePath_B11F_MapScripts @ 0x8165200 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 361 diff --git a/data/maps/NavelRock_BasePath_B1F/header.inc b/data/maps/NavelRock_BasePath_B1F/header.inc index e34db29ef..b7f59616a 100644 --- a/data/maps/NavelRock_BasePath_B1F/header.inc +++ b/data/maps/NavelRock_BasePath_B1F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B1F:: @ 835043C .4byte NavelRock_BasePath_B1F_Layout @ 0x8349544 - .4byte gMapEvents_NavelRock_BasePath_B1F @ 0x83B4A18 - .4byte gMapScripts_NavelRock_BasePath_B1F @ 0x81651F6 + .4byte NavelRock_BasePath_B1F_MapEvents @ 0x83B4A18 + .4byte NavelRock_BasePath_B1F_MapScripts @ 0x81651F6 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 351 diff --git a/data/maps/NavelRock_BasePath_B2F/header.inc b/data/maps/NavelRock_BasePath_B2F/header.inc index bf0cc1d19..55a55d2ab 100644 --- a/data/maps/NavelRock_BasePath_B2F/header.inc +++ b/data/maps/NavelRock_BasePath_B2F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B2F:: @ 8350458 .4byte NavelRock_BasePath_B2F_Layout @ 0x83495CC - .4byte gMapEvents_NavelRock_BasePath_B2F @ 0x83B4A3C - .4byte gMapScripts_NavelRock_BasePath_B2F @ 0x81651F7 + .4byte NavelRock_BasePath_B2F_MapEvents @ 0x83B4A3C + .4byte NavelRock_BasePath_B2F_MapScripts @ 0x81651F7 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 352 diff --git a/data/maps/NavelRock_BasePath_B3F/header.inc b/data/maps/NavelRock_BasePath_B3F/header.inc index 9a85457ec..a2c0a7871 100644 --- a/data/maps/NavelRock_BasePath_B3F/header.inc +++ b/data/maps/NavelRock_BasePath_B3F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B3F:: @ 8350474 .4byte NavelRock_BasePath_B3F_Layout @ 0x8349654 - .4byte gMapEvents_NavelRock_BasePath_B3F @ 0x83B4A60 - .4byte gMapScripts_NavelRock_BasePath_B3F @ 0x81651F8 + .4byte NavelRock_BasePath_B3F_MapEvents @ 0x83B4A60 + .4byte NavelRock_BasePath_B3F_MapScripts @ 0x81651F8 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 353 diff --git a/data/maps/NavelRock_BasePath_B4F/header.inc b/data/maps/NavelRock_BasePath_B4F/header.inc index 75ea7719a..8ea714e88 100644 --- a/data/maps/NavelRock_BasePath_B4F/header.inc +++ b/data/maps/NavelRock_BasePath_B4F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B4F:: @ 8350490 .4byte NavelRock_BasePath_B4F_Layout @ 0x83496DC - .4byte gMapEvents_NavelRock_BasePath_B4F @ 0x83B4A84 - .4byte gMapScripts_NavelRock_BasePath_B4F @ 0x81651F9 + .4byte NavelRock_BasePath_B4F_MapEvents @ 0x83B4A84 + .4byte NavelRock_BasePath_B4F_MapScripts @ 0x81651F9 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 354 diff --git a/data/maps/NavelRock_BasePath_B5F/header.inc b/data/maps/NavelRock_BasePath_B5F/header.inc index 8cc359f34..cceabefd2 100644 --- a/data/maps/NavelRock_BasePath_B5F/header.inc +++ b/data/maps/NavelRock_BasePath_B5F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B5F:: @ 83504AC .4byte NavelRock_BasePath_B5F_Layout @ 0x8349764 - .4byte gMapEvents_NavelRock_BasePath_B5F @ 0x83B4AA8 - .4byte gMapScripts_NavelRock_BasePath_B5F @ 0x81651FA + .4byte NavelRock_BasePath_B5F_MapEvents @ 0x83B4AA8 + .4byte NavelRock_BasePath_B5F_MapScripts @ 0x81651FA .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 355 diff --git a/data/maps/NavelRock_BasePath_B6F/header.inc b/data/maps/NavelRock_BasePath_B6F/header.inc index d69c50370..e2c1d0fa6 100644 --- a/data/maps/NavelRock_BasePath_B6F/header.inc +++ b/data/maps/NavelRock_BasePath_B6F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B6F:: @ 83504C8 .4byte NavelRock_BasePath_B6F_Layout @ 0x83497EC - .4byte gMapEvents_NavelRock_BasePath_B6F @ 0x83B4ACC - .4byte gMapScripts_NavelRock_BasePath_B6F @ 0x81651FB + .4byte NavelRock_BasePath_B6F_MapEvents @ 0x83B4ACC + .4byte NavelRock_BasePath_B6F_MapScripts @ 0x81651FB .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 356 diff --git a/data/maps/NavelRock_BasePath_B7F/header.inc b/data/maps/NavelRock_BasePath_B7F/header.inc index 409329aee..cfcafafb7 100644 --- a/data/maps/NavelRock_BasePath_B7F/header.inc +++ b/data/maps/NavelRock_BasePath_B7F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B7F:: @ 83504E4 .4byte NavelRock_BasePath_B7F_Layout @ 0x8349874 - .4byte gMapEvents_NavelRock_BasePath_B7F @ 0x83B4AF0 - .4byte gMapScripts_NavelRock_BasePath_B7F @ 0x81651FC + .4byte NavelRock_BasePath_B7F_MapEvents @ 0x83B4AF0 + .4byte NavelRock_BasePath_B7F_MapScripts @ 0x81651FC .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 357 diff --git a/data/maps/NavelRock_BasePath_B8F/header.inc b/data/maps/NavelRock_BasePath_B8F/header.inc index 22015b53c..5849c2805 100644 --- a/data/maps/NavelRock_BasePath_B8F/header.inc +++ b/data/maps/NavelRock_BasePath_B8F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B8F:: @ 8350500 .4byte NavelRock_BasePath_B8F_Layout @ 0x83498FC - .4byte gMapEvents_NavelRock_BasePath_B8F @ 0x83B4B14 - .4byte gMapScripts_NavelRock_BasePath_B8F @ 0x81651FD + .4byte NavelRock_BasePath_B8F_MapEvents @ 0x83B4B14 + .4byte NavelRock_BasePath_B8F_MapScripts @ 0x81651FD .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 358 diff --git a/data/maps/NavelRock_BasePath_B9F/header.inc b/data/maps/NavelRock_BasePath_B9F/header.inc index 84f332175..d8b3d5364 100644 --- a/data/maps/NavelRock_BasePath_B9F/header.inc +++ b/data/maps/NavelRock_BasePath_B9F/header.inc @@ -1,7 +1,7 @@ NavelRock_BasePath_B9F:: @ 835051C .4byte NavelRock_BasePath_B9F_Layout @ 0x8349984 - .4byte gMapEvents_NavelRock_BasePath_B9F @ 0x83B4B38 - .4byte gMapScripts_NavelRock_BasePath_B9F @ 0x81651FE + .4byte NavelRock_BasePath_B9F_MapEvents @ 0x83B4B38 + .4byte NavelRock_BasePath_B9F_MapScripts @ 0x81651FE .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 359 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 24326d2bf..0d62b0618 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -1,7 +1,7 @@ NavelRock_Exterior:: @ 834FF88 .4byte NavelRock_Exterior_Layout @ 0x834873C - .4byte gMapEvents_NavelRock_Exterior @ 0x83B3B74 - .4byte gMapScripts_NavelRock_Exterior @ 0x81646AE + .4byte NavelRock_Exterior_MapEvents @ 0x83B3B74 + .4byte NavelRock_Exterior_MapScripts @ 0x81646AE .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 343 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 4d2dc4238..93ab89de4 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -1,7 +1,7 @@ NavelRock_Fork:: @ 835058C .4byte NavelRock_Fork_Layout @ 0x834B9A4 - .4byte gMapEvents_NavelRock_Fork @ 0x83B4BD0 - .4byte gMapScripts_NavelRock_Fork @ 0x8165202 + .4byte NavelRock_Fork_MapEvents @ 0x83B4BD0 + .4byte NavelRock_Fork_MapScripts @ 0x8165202 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 365 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 2a6e89bbe..39261ab96 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -1,7 +1,7 @@ NavelRock_Harbor:: @ 83505FC .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_NavelRock_Harbor @ 0x83B4D70 - .4byte gMapScripts_NavelRock_Harbor @ 0x8165420 + .4byte NavelRock_Harbor_MapEvents @ 0x83B4D70 + .4byte NavelRock_Harbor_MapScripts @ 0x8165420 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 315 diff --git a/data/maps/NavelRock_Summit/header.inc b/data/maps/NavelRock_Summit/header.inc index 39b0c4d8f..d49b0dc14 100644 --- a/data/maps/NavelRock_Summit/header.inc +++ b/data/maps/NavelRock_Summit/header.inc @@ -1,7 +1,7 @@ NavelRock_Summit:: @ 8350394 .4byte NavelRock_Summit_Layout @ 0x8348EB0 - .4byte gMapEvents_NavelRock_Summit @ 0x83B4930 - .4byte gMapScripts_NavelRock_Summit @ 0x8164F9F + .4byte NavelRock_Summit_MapEvents @ 0x83B4930 + .4byte NavelRock_Summit_MapScripts @ 0x8164F9F .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 345 diff --git a/data/maps/NavelRock_SummitPath_2F/header.inc b/data/maps/NavelRock_SummitPath_2F/header.inc index bc56502b3..9ae52b8ca 100644 --- a/data/maps/NavelRock_SummitPath_2F/header.inc +++ b/data/maps/NavelRock_SummitPath_2F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_2F:: @ 83503CC .4byte NavelRock_SummitPath_2F_Layout @ 0x8349324 - .4byte gMapEvents_NavelRock_SummitPath_2F @ 0x83B4988 - .4byte gMapScripts_NavelRock_SummitPath_2F @ 0x81651F2 + .4byte NavelRock_SummitPath_2F_MapEvents @ 0x83B4988 + .4byte NavelRock_SummitPath_2F_MapScripts @ 0x81651F2 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 347 diff --git a/data/maps/NavelRock_SummitPath_3F/header.inc b/data/maps/NavelRock_SummitPath_3F/header.inc index 3454ffd77..2eb984a8a 100644 --- a/data/maps/NavelRock_SummitPath_3F/header.inc +++ b/data/maps/NavelRock_SummitPath_3F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_3F:: @ 83503E8 .4byte NavelRock_SummitPath_3F_Layout @ 0x83493AC - .4byte gMapEvents_NavelRock_SummitPath_3F @ 0x83B49AC - .4byte gMapScripts_NavelRock_SummitPath_3F @ 0x81651F3 + .4byte NavelRock_SummitPath_3F_MapEvents @ 0x83B49AC + .4byte NavelRock_SummitPath_3F_MapScripts @ 0x81651F3 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 348 diff --git a/data/maps/NavelRock_SummitPath_4F/header.inc b/data/maps/NavelRock_SummitPath_4F/header.inc index 996b28555..37baa8cf6 100644 --- a/data/maps/NavelRock_SummitPath_4F/header.inc +++ b/data/maps/NavelRock_SummitPath_4F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_4F:: @ 8350404 .4byte NavelRock_SummitPath_4F_Layout @ 0x8349434 - .4byte gMapEvents_NavelRock_SummitPath_4F @ 0x83B49D0 - .4byte gMapScripts_NavelRock_SummitPath_4F @ 0x81651F4 + .4byte NavelRock_SummitPath_4F_MapEvents @ 0x83B49D0 + .4byte NavelRock_SummitPath_4F_MapScripts @ 0x81651F4 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 349 diff --git a/data/maps/NavelRock_SummitPath_5F/header.inc b/data/maps/NavelRock_SummitPath_5F/header.inc index 5beffe449..88a1d0a8d 100644 --- a/data/maps/NavelRock_SummitPath_5F/header.inc +++ b/data/maps/NavelRock_SummitPath_5F/header.inc @@ -1,7 +1,7 @@ NavelRock_SummitPath_5F:: @ 8350420 .4byte NavelRock_SummitPath_5F_Layout @ 0x83494BC - .4byte gMapEvents_NavelRock_SummitPath_5F @ 0x83B49F4 - .4byte gMapScripts_NavelRock_SummitPath_5F @ 0x81651F5 + .4byte NavelRock_SummitPath_5F_MapEvents @ 0x83B49F4 + .4byte NavelRock_SummitPath_5F_MapScripts @ 0x81651F5 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 350 diff --git a/data/maps/OneIsland/header.inc b/data/maps/OneIsland/header.inc index f54c47e14..a2d521727 100644 --- a/data/maps/OneIsland/header.inc +++ b/data/maps/OneIsland/header.inc @@ -1,7 +1,7 @@ OneIsland:: @ 8350768 .4byte OneIsland_Layout @ 0x8321714 - .4byte gMapEvents_OneIsland @ 0x83B5F44 - .4byte gMapScripts_OneIsland @ 0x8167484 + .4byte OneIsland_MapEvents @ 0x83B5F44 + .4byte OneIsland_MapScripts @ 0x8167484 .4byte OneIsland_MapConnections @ 0x835294C .2byte BGM_FRLG_ISLAND_ONE .2byte 230 diff --git a/data/maps/OneIsland_Harbor/header.inc b/data/maps/OneIsland_Harbor/header.inc index 0a39c9134..d98fcca3a 100644 --- a/data/maps/OneIsland_Harbor/header.inc +++ b/data/maps/OneIsland_Harbor/header.inc @@ -1,7 +1,7 @@ OneIsland_Harbor:: @ 8351BDC .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_OneIsland_Harbor @ 0x83BE558 - .4byte gMapScripts_OneIsland_Harbor @ 0x8171378 + .4byte OneIsland_Harbor_MapEvents @ 0x83BE558 + .4byte OneIsland_Harbor_MapScripts @ 0x8171378 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/OneIsland_House1/header.inc b/data/maps/OneIsland_House1/header.inc index 3c8db882b..7d60ff6d5 100644 --- a/data/maps/OneIsland_House1/header.inc +++ b/data/maps/OneIsland_House1/header.inc @@ -1,7 +1,7 @@ OneIsland_House1:: @ 8351BA4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_OneIsland_House1 @ 0x83BE4D8 - .4byte gMapScripts_OneIsland_House1 @ 0x817135B + .4byte OneIsland_House1_MapEvents @ 0x83BE4D8 + .4byte OneIsland_House1_MapScripts @ 0x817135B .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/OneIsland_House2/header.inc b/data/maps/OneIsland_House2/header.inc index 7df223934..0048e308d 100644 --- a/data/maps/OneIsland_House2/header.inc +++ b/data/maps/OneIsland_House2/header.inc @@ -1,7 +1,7 @@ OneIsland_House2:: @ 8351BC0 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_OneIsland_House2 @ 0x83BE50C - .4byte gMapScripts_OneIsland_House2 @ 0x817136E + .4byte OneIsland_House2_MapEvents @ 0x83BE50C + .4byte OneIsland_House2_MapScripts @ 0x817136E .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/OneIsland_KindleRoad/header.inc b/data/maps/OneIsland_KindleRoad/header.inc index b1c68b719..1c540ae87 100644 --- a/data/maps/OneIsland_KindleRoad/header.inc +++ b/data/maps/OneIsland_KindleRoad/header.inc @@ -1,7 +1,7 @@ OneIsland_KindleRoad:: @ 8350B04 .4byte OneIsland_KindleRoad_Layout @ 0x8325D70 - .4byte gMapEvents_OneIsland_KindleRoad @ 0x83B888C - .4byte gMapScripts_OneIsland_KindleRoad @ 0x8168758 + .4byte OneIsland_KindleRoad_MapEvents @ 0x83B888C + .4byte OneIsland_KindleRoad_MapScripts @ 0x8168758 .4byte OneIsland_KindleRoad_MapConnections @ 0x8352D28 .2byte BGM_FRLG_ROUTE_3 .2byte 237 diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc index b9be8bb22..ca4afdec0 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/header.inc @@ -1,7 +1,7 @@ OneIsland_KindleRoad_EmberSpa:: @ 83505C4 .4byte OneIsland_KindleRoad_EmberSpa_Layout @ 0x834EB70 - .4byte gMapEvents_OneIsland_KindleRoad_EmberSpa @ 0x83B4CD8 - .4byte gMapScripts_OneIsland_KindleRoad_EmberSpa @ 0x816535B + .4byte OneIsland_KindleRoad_EmberSpa_MapEvents @ 0x83B4CD8 + .4byte OneIsland_KindleRoad_EmberSpa_MapScripts @ 0x816535B .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 383 diff --git a/data/maps/OneIsland_PokemonCenter_1F/header.inc b/data/maps/OneIsland_PokemonCenter_1F/header.inc index 53afa9da1..815f1fc82 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/header.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ OneIsland_PokemonCenter_1F:: @ 8351B6C .4byte OneIsland_PokemonCenter_1F_Layout @ 0x833A970 - .4byte gMapEvents_OneIsland_PokemonCenter_1F @ 0x83BE400 - .4byte gMapScripts_OneIsland_PokemonCenter_1F @ 0x8170BF8 + .4byte OneIsland_PokemonCenter_1F_MapEvents @ 0x83BE400 + .4byte OneIsland_PokemonCenter_1F_MapScripts @ 0x8170BF8 .4byte NULL .2byte BGM_FRLG_POKEMON_NETWORK_CENTER .2byte 271 diff --git a/data/maps/OneIsland_PokemonCenter_2F/header.inc b/data/maps/OneIsland_PokemonCenter_2F/header.inc index 87fa3c548..d0a077901 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/header.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ OneIsland_PokemonCenter_2F:: @ 8351B88 .4byte OneIsland_PokemonCenter_2F_Layout @ 0x8344108 - .4byte gMapEvents_OneIsland_PokemonCenter_2F @ 0x83BE48C - .4byte gMapScripts_OneIsland_PokemonCenter_2F @ 0x8171334 + .4byte OneIsland_PokemonCenter_2F_MapEvents @ 0x83BE48C + .4byte OneIsland_PokemonCenter_2F_MapScripts @ 0x8171334 .4byte NULL .2byte BGM_FRLG_POKEMON_NETWORK_CENTER .2byte 316 diff --git a/data/maps/OneIsland_TreasureBeach/header.inc b/data/maps/OneIsland_TreasureBeach/header.inc index 203c7a407..419a99ea7 100644 --- a/data/maps/OneIsland_TreasureBeach/header.inc +++ b/data/maps/OneIsland_TreasureBeach/header.inc @@ -1,7 +1,7 @@ OneIsland_TreasureBeach:: @ 8350B20 .4byte OneIsland_TreasureBeach_Layout @ 0x8326514 - .4byte gMapEvents_OneIsland_TreasureBeach @ 0x83B8930 - .4byte gMapScripts_OneIsland_TreasureBeach @ 0x816876B + .4byte OneIsland_TreasureBeach_MapEvents @ 0x83B8930 + .4byte OneIsland_TreasureBeach_MapScripts @ 0x816876B .4byte OneIsland_TreasureBeach_MapConnections @ 0x8352D3C .2byte BGM_FRLG_ROUTE_3 .2byte 238 diff --git a/data/maps/PalletTown/header.inc b/data/maps/PalletTown/header.inc index f148906c6..8d9104896 100644 --- a/data/maps/PalletTown/header.inc +++ b/data/maps/PalletTown/header.inc @@ -1,7 +1,7 @@ PalletTown:: @ 8350618 .4byte PalletTown_Layout @ 0x82DD4C0 - .4byte gMapEvents_PalletTown @ 0x83B4E50 - .4byte gMapScripts_PalletTown @ 0x816545A + .4byte PalletTown_MapEvents @ 0x83B4E50 + .4byte PalletTown_MapScripts @ 0x816545A .4byte PalletTown_MapConnections @ 0x835276C .2byte BGM_FRLG_PALLET_TOWN .2byte 78 diff --git a/data/maps/PalletTown_GarysHouse/header.inc b/data/maps/PalletTown_GarysHouse/header.inc index 6179b28ee..da1b1bd3e 100644 --- a/data/maps/PalletTown_GarysHouse/header.inc +++ b/data/maps/PalletTown_GarysHouse/header.inc @@ -1,7 +1,7 @@ PalletTown_GarysHouse:: @ 8350D88 .4byte PalletTown_GarysHouse_Layout @ 0x82D5424 - .4byte gMapEvents_PalletTown_GarysHouse @ 0x83B980C - .4byte gMapScripts_PalletTown_GarysHouse @ 0x8168D27 + .4byte PalletTown_GarysHouse_MapEvents @ 0x83B980C + .4byte PalletTown_GarysHouse_MapScripts @ 0x8168D27 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 3 diff --git a/data/maps/PalletTown_PlayersHouse_1F/header.inc b/data/maps/PalletTown_PlayersHouse_1F/header.inc index 48c815047..16a3b2627 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/header.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/header.inc @@ -1,7 +1,7 @@ PalletTown_PlayersHouse_1F:: @ 8350D50 .4byte PalletTown_PlayersHouse_1F_Layout @ 0x82D5200 - .4byte gMapEvents_PalletTown_PlayersHouse_1F @ 0x83B974C - .4byte gMapScripts_PalletTown_PlayersHouse_1F @ 0x8168C08 + .4byte PalletTown_PlayersHouse_1F_MapEvents @ 0x83B974C + .4byte PalletTown_PlayersHouse_1F_MapScripts @ 0x8168C08 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 1 diff --git a/data/maps/PalletTown_PlayersHouse_2F/header.inc b/data/maps/PalletTown_PlayersHouse_2F/header.inc index 5b99b625d..8f886a89c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/header.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/header.inc @@ -1,7 +1,7 @@ PalletTown_PlayersHouse_2F:: @ 8350D6C .4byte PalletTown_PlayersHouse_2F_Layout @ 0x82D52FC - .4byte gMapEvents_PalletTown_PlayersHouse_2F @ 0x83B978C - .4byte gMapScripts_PalletTown_PlayersHouse_2F @ 0x8168CA3 + .4byte PalletTown_PlayersHouse_2F_MapEvents @ 0x83B978C + .4byte PalletTown_PlayersHouse_2F_MapScripts @ 0x8168CA3 .4byte NULL .2byte BGM_FRLG_PALLET_TOWN .2byte 2 diff --git a/data/maps/PalletTown_ProfessorOaksLab/header.inc b/data/maps/PalletTown_ProfessorOaksLab/header.inc index 226e0ce92..2d2667998 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/header.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/header.inc @@ -1,7 +1,7 @@ PalletTown_ProfessorOaksLab:: @ 8350DA4 .4byte PalletTown_ProfessorOaksLab_Layout @ 0x82D5668 - .4byte gMapEvents_PalletTown_ProfessorOaksLab @ 0x83B99B8 - .4byte gMapScripts_PalletTown_ProfessorOaksLab @ 0x8168F7E + .4byte PalletTown_ProfessorOaksLab_MapEvents @ 0x83B99B8 + .4byte PalletTown_ProfessorOaksLab_MapScripts @ 0x8168F7E .4byte NULL .2byte BGM_FRLG_OAK_LAB .2byte 5 diff --git a/data/maps/PewterCity/header.inc b/data/maps/PewterCity/header.inc index 9fcbb10ed..f6f16be53 100644 --- a/data/maps/PewterCity/header.inc +++ b/data/maps/PewterCity/header.inc @@ -1,7 +1,7 @@ PewterCity:: @ 8350650 .4byte PewterCity_Layout @ 0x82DF308 - .4byte gMapEvents_PewterCity @ 0x83B518C - .4byte gMapScripts_PewterCity @ 0x8165B8E + .4byte PewterCity_MapEvents @ 0x83B518C + .4byte PewterCity_MapScripts @ 0x8165B8E .4byte PewterCity_MapConnections @ 0x83527B8 .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 80 diff --git a/data/maps/PewterCity_Gym/header.inc b/data/maps/PewterCity_Gym/header.inc index 4d8348987..088aa1ab1 100644 --- a/data/maps/PewterCity_Gym/header.inc +++ b/data/maps/PewterCity_Gym/header.inc @@ -1,7 +1,7 @@ PewterCity_Gym:: @ 8350EA0 .4byte PewterCity_Gym_Layout @ 0x82D732C - .4byte gMapEvents_PewterCity_Gym @ 0x83BA058 - .4byte gMapScripts_PewterCity_Gym @ 0x816A592 + .4byte PewterCity_Gym_MapEvents @ 0x83BA058 + .4byte PewterCity_Gym_MapScripts @ 0x816A592 .4byte NULL .2byte BGM_FRLG_GYM .2byte 28 diff --git a/data/maps/PewterCity_House1/header.inc b/data/maps/PewterCity_House1/header.inc index 547b7ca0c..933c38e45 100644 --- a/data/maps/PewterCity_House1/header.inc +++ b/data/maps/PewterCity_House1/header.inc @@ -1,7 +1,7 @@ PewterCity_House1:: @ 8350ED8 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_PewterCity_House1 @ 0x83BA140 - .4byte gMapScripts_PewterCity_House1 @ 0x816A71C + .4byte PewterCity_House1_MapEvents @ 0x83BA140 + .4byte PewterCity_House1_MapScripts @ 0x816A71C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/PewterCity_House2/header.inc b/data/maps/PewterCity_House2/header.inc index a793efd1c..af76d49ff 100644 --- a/data/maps/PewterCity_House2/header.inc +++ b/data/maps/PewterCity_House2/header.inc @@ -1,7 +1,7 @@ PewterCity_House2:: @ 8350F2C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_PewterCity_House2 @ 0x83BA304 - .4byte gMapScripts_PewterCity_House2 @ 0x816A7DC + .4byte PewterCity_House2_MapEvents @ 0x83BA304 + .4byte PewterCity_House2_MapScripts @ 0x816A7DC .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/PewterCity_Mart/header.inc b/data/maps/PewterCity_Mart/header.inc index ec685db00..2cd4eccad 100644 --- a/data/maps/PewterCity_Mart/header.inc +++ b/data/maps/PewterCity_Mart/header.inc @@ -1,7 +1,7 @@ PewterCity_Mart:: @ 8350EBC .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_PewterCity_Mart @ 0x83BA0CC - .4byte gMapScripts_PewterCity_Mart @ 0x816A6CD + .4byte PewterCity_Mart_MapEvents @ 0x83BA0CC + .4byte PewterCity_Mart_MapScripts @ 0x816A6CD .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/PewterCity_Museum_1F/header.inc b/data/maps/PewterCity_Museum_1F/header.inc index 255e31980..b2ae946ec 100644 --- a/data/maps/PewterCity_Museum_1F/header.inc +++ b/data/maps/PewterCity_Museum_1F/header.inc @@ -1,7 +1,7 @@ PewterCity_Museum_1F:: @ 8350E68 .4byte PewterCity_Museum_1F_Layout @ 0x831A1FC - .4byte gMapEvents_PewterCity_Museum_1F @ 0x83B9ED8 - .4byte gMapScripts_PewterCity_Museum_1F @ 0x816A31A + .4byte PewterCity_Museum_1F_MapEvents @ 0x83B9ED8 + .4byte PewterCity_Museum_1F_MapScripts @ 0x816A31A .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 180 diff --git a/data/maps/PewterCity_Museum_2F/header.inc b/data/maps/PewterCity_Museum_2F/header.inc index 6b6c397ed..d62dc30e1 100644 --- a/data/maps/PewterCity_Museum_2F/header.inc +++ b/data/maps/PewterCity_Museum_2F/header.inc @@ -1,7 +1,7 @@ PewterCity_Museum_2F:: @ 8350E84 .4byte PewterCity_Museum_2F_Layout @ 0x831A39C - .4byte gMapEvents_PewterCity_Museum_2F @ 0x83B9FCC - .4byte gMapScripts_PewterCity_Museum_2F @ 0x816A552 + .4byte PewterCity_Museum_2F_MapEvents @ 0x83B9FCC + .4byte PewterCity_Museum_2F_MapScripts @ 0x816A552 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 181 diff --git a/data/maps/PewterCity_PokemonCenter_1F/header.inc b/data/maps/PewterCity_PokemonCenter_1F/header.inc index 89d2f8208..9270308b7 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/header.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ PewterCity_PokemonCenter_1F:: @ 8350EF4 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_PewterCity_PokemonCenter_1F @ 0x83BA21C - .4byte gMapScripts_PewterCity_PokemonCenter_1F @ 0x816A760 + .4byte PewterCity_PokemonCenter_1F_MapEvents @ 0x83BA21C + .4byte PewterCity_PokemonCenter_1F_MapScripts @ 0x816A760 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/PewterCity_PokemonCenter_2F/header.inc b/data/maps/PewterCity_PokemonCenter_2F/header.inc index 39b506417..c050eb5fb 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/header.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ PewterCity_PokemonCenter_2F:: @ 8350F10 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_PewterCity_PokemonCenter_2F @ 0x83BA2A8 - .4byte gMapScripts_PewterCity_PokemonCenter_2F @ 0x816A7B5 + .4byte PewterCity_PokemonCenter_2F_MapEvents @ 0x83BA2A8 + .4byte PewterCity_PokemonCenter_2F_MapScripts @ 0x816A7B5 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/PokemonLeague_AgathasRoom/header.inc b/data/maps/PokemonLeague_AgathasRoom/header.inc index a5f4c703b..1e253cb1c 100644 --- a/data/maps/PokemonLeague_AgathasRoom/header.inc +++ b/data/maps/PokemonLeague_AgathasRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_AgathasRoom:: @ 834FA80 .4byte PokemonLeague_AgathasRoom_Layout @ 0x831F468 - .4byte gMapEvents_PokemonLeague_AgathasRoom @ 0x83B1928 - .4byte gMapScripts_PokemonLeague_AgathasRoom @ 0x8162810 + .4byte PokemonLeague_AgathasRoom_MapEvents @ 0x83B1928 + .4byte PokemonLeague_AgathasRoom_MapScripts @ 0x8162810 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 215 diff --git a/data/maps/PokemonLeague_BrunosRoom/header.inc b/data/maps/PokemonLeague_BrunosRoom/header.inc index b8fa38018..4a0db477d 100644 --- a/data/maps/PokemonLeague_BrunosRoom/header.inc +++ b/data/maps/PokemonLeague_BrunosRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_BrunosRoom:: @ 834FA64 .4byte PokemonLeague_BrunosRoom_Layout @ 0x831F2F0 - .4byte gMapEvents_PokemonLeague_BrunosRoom @ 0x83B18EC - .4byte gMapScripts_PokemonLeague_BrunosRoom @ 0x8162685 + .4byte PokemonLeague_BrunosRoom_MapEvents @ 0x83B18EC + .4byte PokemonLeague_BrunosRoom_MapScripts @ 0x8162685 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 214 diff --git a/data/maps/PokemonLeague_ChampionsRoom/header.inc b/data/maps/PokemonLeague_ChampionsRoom/header.inc index f08a9d072..8dd19508d 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/header.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_ChampionsRoom:: @ 834FAB8 .4byte PokemonLeague_ChampionsRoom_Layout @ 0x831FBF8 - .4byte gMapEvents_PokemonLeague_ChampionsRoom @ 0x83B19B8 - .4byte gMapScripts_PokemonLeague_ChampionsRoom @ 0x8162AE2 + .4byte PokemonLeague_ChampionsRoom_MapEvents @ 0x83B19B8 + .4byte PokemonLeague_ChampionsRoom_MapScripts @ 0x8162AE2 .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 217 diff --git a/data/maps/PokemonLeague_HallOfFame/header.inc b/data/maps/PokemonLeague_HallOfFame/header.inc index 0b1464dbb..aa3d6c3b9 100644 --- a/data/maps/PokemonLeague_HallOfFame/header.inc +++ b/data/maps/PokemonLeague_HallOfFame/header.inc @@ -1,7 +1,7 @@ PokemonLeague_HallOfFame:: @ 834FAD4 .4byte PokemonLeague_HallOfFame_Layout @ 0x831FD3C - .4byte gMapEvents_PokemonLeague_HallOfFame @ 0x83B19EC - .4byte gMapScripts_PokemonLeague_HallOfFame @ 0x8162D4C + .4byte PokemonLeague_HallOfFame_MapEvents @ 0x83B19EC + .4byte PokemonLeague_HallOfFame_MapScripts @ 0x8162D4C .4byte NULL .2byte BGM_FRLG_HALL_OF_FAME_PALLET_TOWN .2byte 218 diff --git a/data/maps/PokemonLeague_LancesRoom/header.inc b/data/maps/PokemonLeague_LancesRoom/header.inc index ac970db8f..d37a1c254 100644 --- a/data/maps/PokemonLeague_LancesRoom/header.inc +++ b/data/maps/PokemonLeague_LancesRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_LancesRoom:: @ 834FA9C .4byte PokemonLeague_LancesRoom_Layout @ 0x831F9CC - .4byte gMapEvents_PokemonLeague_LancesRoom @ 0x83B1964 - .4byte gMapScripts_PokemonLeague_LancesRoom @ 0x816292D + .4byte PokemonLeague_LancesRoom_MapEvents @ 0x83B1964 + .4byte PokemonLeague_LancesRoom_MapScripts @ 0x816292D .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 216 diff --git a/data/maps/PokemonLeague_LoreleisRoom/header.inc b/data/maps/PokemonLeague_LoreleisRoom/header.inc index 01f12285b..c72d978f6 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/header.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/header.inc @@ -1,7 +1,7 @@ PokemonLeague_LoreleisRoom:: @ 834FA48 .4byte PokemonLeague_LoreleisRoom_Layout @ 0x831F178 - .4byte gMapEvents_PokemonLeague_LoreleisRoom @ 0x83B18B0 - .4byte gMapScripts_PokemonLeague_LoreleisRoom @ 0x816256C + .4byte PokemonLeague_LoreleisRoom_MapEvents @ 0x83B18B0 + .4byte PokemonLeague_LoreleisRoom_MapScripts @ 0x816256C .4byte NULL .2byte BGM_FRLG_GYM .2byte 213 diff --git a/data/maps/PokemonMansion_1F/header.inc b/data/maps/PokemonMansion_1F/header.inc index 167c4d42b..b3e59a63c 100644 --- a/data/maps/PokemonMansion_1F/header.inc +++ b/data/maps/PokemonMansion_1F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_1F:: @ 834F888 .4byte PokemonMansion_1F_Layout @ 0x830AE3C - .4byte gMapEvents_PokemonMansion_1F @ 0x83B0C60 - .4byte gMapScripts_PokemonMansion_1F @ 0x81621F9 + .4byte PokemonMansion_1F_MapEvents @ 0x83B0C60 + .4byte PokemonMansion_1F_MapScripts @ 0x81621F9 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 143 diff --git a/data/maps/PokemonMansion_2F/header.inc b/data/maps/PokemonMansion_2F/header.inc index 39716d024..f3b161fdd 100644 --- a/data/maps/PokemonMansion_2F/header.inc +++ b/data/maps/PokemonMansion_2F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_2F:: @ 834F8A4 .4byte PokemonMansion_2F_Layout @ 0x830B9A8 - .4byte gMapEvents_PokemonMansion_2F @ 0x83B0D20 - .4byte gMapScripts_PokemonMansion_2F @ 0x8162254 + .4byte PokemonMansion_2F_MapEvents @ 0x83B0D20 + .4byte PokemonMansion_2F_MapScripts @ 0x8162254 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 144 diff --git a/data/maps/PokemonMansion_3F/header.inc b/data/maps/PokemonMansion_3F/header.inc index 9dde682d0..e86dc4f3b 100644 --- a/data/maps/PokemonMansion_3F/header.inc +++ b/data/maps/PokemonMansion_3F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_3F:: @ 834F8C0 .4byte PokemonMansion_3F_Layout @ 0x830C430 - .4byte gMapEvents_PokemonMansion_3F @ 0x83B0DF8 - .4byte gMapScripts_PokemonMansion_3F @ 0x81622A1 + .4byte PokemonMansion_3F_MapEvents @ 0x83B0DF8 + .4byte PokemonMansion_3F_MapScripts @ 0x81622A1 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 145 diff --git a/data/maps/PokemonMansion_B1F/header.inc b/data/maps/PokemonMansion_B1F/header.inc index 28d4cec5e..a5d64c3bf 100644 --- a/data/maps/PokemonMansion_B1F/header.inc +++ b/data/maps/PokemonMansion_B1F/header.inc @@ -1,7 +1,7 @@ PokemonMansion_B1F:: @ 834F8DC .4byte PokemonMansion_B1F_Layout @ 0x830CEB8 - .4byte gMapEvents_PokemonMansion_B1F @ 0x83B0ED4 - .4byte gMapScripts_PokemonMansion_B1F @ 0x81622FC + .4byte PokemonMansion_B1F_MapEvents @ 0x83B0ED4 + .4byte PokemonMansion_B1F_MapScripts @ 0x81622FC .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 146 diff --git a/data/maps/PokemonTower_1F/header.inc b/data/maps/PokemonTower_1F/header.inc index 94aefddf2..61a8cd0fb 100644 --- a/data/maps/PokemonTower_1F/header.inc +++ b/data/maps/PokemonTower_1F/header.inc @@ -1,7 +1,7 @@ PokemonTower_1F:: @ 834FBB4 .4byte PokemonTower_1F_Layout @ 0x83167F4 - .4byte gMapEvents_PokemonTower_1F @ 0x83B2270 - .4byte gMapScripts_PokemonTower_1F @ 0x8163235 + .4byte PokemonTower_1F_MapEvents @ 0x83B2270 + .4byte PokemonTower_1F_MapScripts @ 0x8163235 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 161 diff --git a/data/maps/PokemonTower_2F/header.inc b/data/maps/PokemonTower_2F/header.inc index 45838cb9b..ee7c892ce 100644 --- a/data/maps/PokemonTower_2F/header.inc +++ b/data/maps/PokemonTower_2F/header.inc @@ -1,7 +1,7 @@ PokemonTower_2F:: @ 834FBD0 .4byte PokemonTower_2F_Layout @ 0x8316BD8 - .4byte gMapEvents_PokemonTower_2F @ 0x83B22E4 - .4byte gMapScripts_PokemonTower_2F @ 0x8163285 + .4byte PokemonTower_2F_MapEvents @ 0x83B22E4 + .4byte PokemonTower_2F_MapScripts @ 0x8163285 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 162 diff --git a/data/maps/PokemonTower_3F/header.inc b/data/maps/PokemonTower_3F/header.inc index cd7c8fa57..9d972f0a1 100644 --- a/data/maps/PokemonTower_3F/header.inc +++ b/data/maps/PokemonTower_3F/header.inc @@ -1,7 +1,7 @@ PokemonTower_3F:: @ 834FBEC .4byte PokemonTower_3F_Layout @ 0x8316FBC - .4byte gMapEvents_PokemonTower_3F @ 0x83B2368 - .4byte gMapScripts_PokemonTower_3F @ 0x81633A6 + .4byte PokemonTower_3F_MapEvents @ 0x83B2368 + .4byte PokemonTower_3F_MapScripts @ 0x81633A6 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 163 diff --git a/data/maps/PokemonTower_4F/header.inc b/data/maps/PokemonTower_4F/header.inc index 63fccbe42..fe31ef96b 100644 --- a/data/maps/PokemonTower_4F/header.inc +++ b/data/maps/PokemonTower_4F/header.inc @@ -1,7 +1,7 @@ PokemonTower_4F:: @ 834FC08 .4byte PokemonTower_4F_Layout @ 0x83173A0 - .4byte gMapEvents_PokemonTower_4F @ 0x83B241C - .4byte gMapScripts_PokemonTower_4F @ 0x81633EC + .4byte PokemonTower_4F_MapEvents @ 0x83B241C + .4byte PokemonTower_4F_MapScripts @ 0x81633EC .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 164 diff --git a/data/maps/PokemonTower_5F/header.inc b/data/maps/PokemonTower_5F/header.inc index d5328464b..f2e38b1b6 100644 --- a/data/maps/PokemonTower_5F/header.inc +++ b/data/maps/PokemonTower_5F/header.inc @@ -1,7 +1,7 @@ PokemonTower_5F:: @ 834FC24 .4byte PokemonTower_5F_Layout @ 0x8317784 - .4byte gMapEvents_PokemonTower_5F @ 0x83B2604 - .4byte gMapScripts_PokemonTower_5F @ 0x8163432 + .4byte PokemonTower_5F_MapEvents @ 0x83B2604 + .4byte PokemonTower_5F_MapScripts @ 0x8163432 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 165 diff --git a/data/maps/PokemonTower_6F/header.inc b/data/maps/PokemonTower_6F/header.inc index 4f928c92d..6bafef55e 100644 --- a/data/maps/PokemonTower_6F/header.inc +++ b/data/maps/PokemonTower_6F/header.inc @@ -1,7 +1,7 @@ PokemonTower_6F:: @ 834FC40 .4byte PokemonTower_6F_Layout @ 0x8317B68 - .4byte gMapEvents_PokemonTower_6F @ 0x83B26C0 - .4byte gMapScripts_PokemonTower_6F @ 0x81634B7 + .4byte PokemonTower_6F_MapEvents @ 0x83B26C0 + .4byte PokemonTower_6F_MapScripts @ 0x81634B7 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 166 diff --git a/data/maps/PokemonTower_7F/header.inc b/data/maps/PokemonTower_7F/header.inc index ada7b480e..4125a4d9f 100644 --- a/data/maps/PokemonTower_7F/header.inc +++ b/data/maps/PokemonTower_7F/header.inc @@ -1,7 +1,7 @@ PokemonTower_7F:: @ 834FC5C .4byte PokemonTower_7F_Layout @ 0x8317F4C - .4byte gMapEvents_PokemonTower_7F @ 0x83B2748 - .4byte gMapScripts_PokemonTower_7F @ 0x8163559 + .4byte PokemonTower_7F_MapEvents @ 0x83B2748 + .4byte PokemonTower_7F_MapScripts @ 0x8163559 .4byte NULL .2byte BGM_FRLG_POKEMON_TOWER .2byte 167 diff --git a/data/maps/PowerPlant/header.inc b/data/maps/PowerPlant/header.inc index 2062f30c3..530e24a98 100644 --- a/data/maps/PowerPlant/header.inc +++ b/data/maps/PowerPlant/header.inc @@ -1,7 +1,7 @@ PowerPlant:: @ 834FC78 .4byte PowerPlant_Layout @ 0x8318EC0 - .4byte gMapEvents_PowerPlant @ 0x83B285C - .4byte gMapScripts_PowerPlant @ 0x8163764 + .4byte PowerPlant_MapEvents @ 0x83B285C + .4byte PowerPlant_MapScripts @ 0x8163764 .4byte NULL .2byte BGM_FRLG_POKEMON_MANSION .2byte 168 diff --git a/data/maps/RockTunnel_1F/header.inc b/data/maps/RockTunnel_1F/header.inc index 21bd063fd..5a9e6fac6 100644 --- a/data/maps/RockTunnel_1F/header.inc +++ b/data/maps/RockTunnel_1F/header.inc @@ -1,7 +1,7 @@ RockTunnel_1F:: @ 834FAF0 .4byte RockTunnel_1F_Layout @ 0x83130E4 - .4byte gMapEvents_RockTunnel_1F @ 0x83B1B2C - .4byte gMapScripts_RockTunnel_1F @ 0x8162DD6 + .4byte RockTunnel_1F_MapEvents @ 0x83B1B2C + .4byte RockTunnel_1F_MapScripts @ 0x8162DD6 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 154 diff --git a/data/maps/RockTunnel_B1F/header.inc b/data/maps/RockTunnel_B1F/header.inc index 9b6e260e9..7ee412e7b 100644 --- a/data/maps/RockTunnel_B1F/header.inc +++ b/data/maps/RockTunnel_B1F/header.inc @@ -1,7 +1,7 @@ RockTunnel_B1F:: @ 834FB0C .4byte RockTunnel_B1F_Layout @ 0x8314008 - .4byte gMapEvents_RockTunnel_B1F @ 0x83B1DD0 - .4byte gMapScripts_RockTunnel_B1F @ 0x8162E8A + .4byte RockTunnel_B1F_MapEvents @ 0x83B1DD0 + .4byte RockTunnel_B1F_MapScripts @ 0x8162E8A .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 155 diff --git a/data/maps/RocketHideout_B1F/header.inc b/data/maps/RocketHideout_B1F/header.inc index 0cba66e5d..76da1d708 100644 --- a/data/maps/RocketHideout_B1F/header.inc +++ b/data/maps/RocketHideout_B1F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B1F:: @ 834F6AC .4byte RocketHideout_B1F_Layout @ 0x8305C28 - .4byte gMapEvents_RocketHideout_B1F @ 0x83AF9D8 - .4byte gMapScripts_RocketHideout_B1F @ 0x8161195 + .4byte RocketHideout_B1F_MapEvents @ 0x83AF9D8 + .4byte RocketHideout_B1F_MapScripts @ 0x8161195 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 128 diff --git a/data/maps/RocketHideout_B2F/header.inc b/data/maps/RocketHideout_B2F/header.inc index 516adc9a2..6f3624422 100644 --- a/data/maps/RocketHideout_B2F/header.inc +++ b/data/maps/RocketHideout_B2F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B2F:: @ 834F6C8 .4byte RocketHideout_B2F_Layout @ 0x83061CC - .4byte gMapEvents_RocketHideout_B2F @ 0x83AFA8C - .4byte gMapScripts_RocketHideout_B2F @ 0x81612A1 + .4byte RocketHideout_B2F_MapEvents @ 0x83AFA8C + .4byte RocketHideout_B2F_MapScripts @ 0x81612A1 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 129 diff --git a/data/maps/RocketHideout_B3F/header.inc b/data/maps/RocketHideout_B3F/header.inc index 2a639bda8..82aff9271 100644 --- a/data/maps/RocketHideout_B3F/header.inc +++ b/data/maps/RocketHideout_B3F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B3F:: @ 834F6E4 .4byte RocketHideout_B3F_Layout @ 0x8306694 - .4byte gMapEvents_RocketHideout_B3F @ 0x83AFB34 - .4byte gMapScripts_RocketHideout_B3F @ 0x81612B9 + .4byte RocketHideout_B3F_MapEvents @ 0x83AFB34 + .4byte RocketHideout_B3F_MapScripts @ 0x81612B9 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 130 diff --git a/data/maps/RocketHideout_B4F/header.inc b/data/maps/RocketHideout_B4F/header.inc index 0cf775f5a..1d37c165d 100644 --- a/data/maps/RocketHideout_B4F/header.inc +++ b/data/maps/RocketHideout_B4F/header.inc @@ -1,7 +1,7 @@ RocketHideout_B4F:: @ 834F700 .4byte RocketHideout_B4F_Layout @ 0x8306B98 - .4byte gMapEvents_RocketHideout_B4F @ 0x83AFC50 - .4byte gMapScripts_RocketHideout_B4F @ 0x81612E8 + .4byte RocketHideout_B4F_MapEvents @ 0x83AFC50 + .4byte RocketHideout_B4F_MapScripts @ 0x81612E8 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 131 diff --git a/data/maps/RocketHideout_Elevator/header.inc b/data/maps/RocketHideout_Elevator/header.inc index 70c8c2a22..321b9829d 100644 --- a/data/maps/RocketHideout_Elevator/header.inc +++ b/data/maps/RocketHideout_Elevator/header.inc @@ -1,7 +1,7 @@ RocketHideout_Elevator:: @ 834F71C .4byte RocketHideout_Elevator_Layout @ 0x8320EDC - .4byte gMapEvents_RocketHideout_Elevator @ 0x83AFC80 - .4byte gMapScripts_RocketHideout_Elevator @ 0x81614D8 + .4byte RocketHideout_Elevator_MapEvents @ 0x83AFC80 + .4byte RocketHideout_Elevator_MapScripts @ 0x81614D8 .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 225 diff --git a/data/maps/Route1/header.inc b/data/maps/Route1/header.inc index 6f2a76447..900563a23 100644 --- a/data/maps/Route1/header.inc +++ b/data/maps/Route1/header.inc @@ -1,7 +1,7 @@ Route1:: @ 835082C .4byte Route1_Layout @ 0x82E55CC - .4byte gMapEvents_Route1 @ 0x83B6648 - .4byte gMapScripts_Route1 @ 0x8167EFD + .4byte Route1_MapEvents @ 0x83B6648 + .4byte Route1_MapScripts @ 0x8167EFD .4byte Route1_MapConnections @ 0x83529F4 .2byte BGM_FRLG_ROUTE_1 .2byte 89 diff --git a/data/maps/Route10/header.inc b/data/maps/Route10/header.inc index 8c8dc7244..3557919fb 100644 --- a/data/maps/Route10/header.inc +++ b/data/maps/Route10/header.inc @@ -1,7 +1,7 @@ Route10:: @ 8350928 .4byte Route10_Layout @ 0x82EC3D0 - .4byte gMapEvents_Route10 @ 0x83B6FA0 - .4byte gMapScripts_Route10 @ 0x8167FD9 + .4byte Route10_MapEvents @ 0x83B6FA0 + .4byte Route10_MapScripts @ 0x8167FD9 .4byte Route10_MapConnections @ 0x8352B14 .2byte BGM_FRLG_ROUTE_3 .2byte 98 diff --git a/data/maps/Route10_PokemonCenter_1F/header.inc b/data/maps/Route10_PokemonCenter_1F/header.inc index 3e965c250..2f7bd05cc 100644 --- a/data/maps/Route10_PokemonCenter_1F/header.inc +++ b/data/maps/Route10_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ Route10_PokemonCenter_1F:: @ 83518B0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route10_PokemonCenter_1F @ 0x83BD8FC - .4byte gMapScripts_Route10_PokemonCenter_1F @ 0x816FC2F + .4byte Route10_PokemonCenter_1F_MapEvents @ 0x83BD8FC + .4byte Route10_PokemonCenter_1F_MapScripts @ 0x816FC2F .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/Route10_PokemonCenter_2F/header.inc b/data/maps/Route10_PokemonCenter_2F/header.inc index 9502d74d9..5ed083920 100644 --- a/data/maps/Route10_PokemonCenter_2F/header.inc +++ b/data/maps/Route10_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ Route10_PokemonCenter_2F:: @ 83518CC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route10_PokemonCenter_2F @ 0x83BD988 - .4byte gMapScripts_Route10_PokemonCenter_2F @ 0x816FCFA + .4byte Route10_PokemonCenter_2F_MapEvents @ 0x83BD988 + .4byte Route10_PokemonCenter_2F_MapScripts @ 0x816FCFA .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/Route11/header.inc b/data/maps/Route11/header.inc index 93550fb3c..92ea71fdb 100644 --- a/data/maps/Route11/header.inc +++ b/data/maps/Route11/header.inc @@ -1,7 +1,7 @@ Route11:: @ 8350944 .4byte Route11_Layout @ 0x82ECF34 - .4byte gMapEvents_Route11 @ 0x83B711C - .4byte gMapScripts_Route11 @ 0x8167FF6 + .4byte Route11_MapEvents @ 0x83B711C + .4byte Route11_MapScripts @ 0x8167FF6 .4byte Route11_MapConnections @ 0x8352B34 .2byte BGM_FRLG_ROUTE_11 .2byte 99 diff --git a/data/maps/Route11_EastEntrance_1F/header.inc b/data/maps/Route11_EastEntrance_1F/header.inc index d8f7762e3..8c54bc523 100644 --- a/data/maps/Route11_EastEntrance_1F/header.inc +++ b/data/maps/Route11_EastEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route11_EastEntrance_1F:: @ 83518E8 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route11_EastEntrance_1F @ 0x83BD9F4 - .4byte gMapScripts_Route11_EastEntrance_1F @ 0x816FD21 + .4byte Route11_EastEntrance_1F_MapEvents @ 0x83BD9F4 + .4byte Route11_EastEntrance_1F_MapScripts @ 0x816FD21 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 224 diff --git a/data/maps/Route11_EastEntrance_2F/header.inc b/data/maps/Route11_EastEntrance_2F/header.inc index 964580122..4b3611c21 100644 --- a/data/maps/Route11_EastEntrance_2F/header.inc +++ b/data/maps/Route11_EastEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route11_EastEntrance_2F:: @ 8351904 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route11_EastEntrance_2F @ 0x83BDA58 - .4byte gMapScripts_Route11_EastEntrance_2F @ 0x816FD34 + .4byte Route11_EastEntrance_2F_MapEvents @ 0x83BDA58 + .4byte Route11_EastEntrance_2F_MapScripts @ 0x816FD34 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 220 diff --git a/data/maps/Route12/header.inc b/data/maps/Route12/header.inc index 89963d62a..882794915 100644 --- a/data/maps/Route12/header.inc +++ b/data/maps/Route12/header.inc @@ -1,7 +1,7 @@ Route12:: @ 8350960 .4byte Route12_Layout @ 0x82EE5D8 - .4byte gMapEvents_Route12 @ 0x83B72DC - .4byte gMapScripts_Route12 @ 0x8168000 + .4byte Route12_MapEvents @ 0x83B72DC + .4byte Route12_MapScripts @ 0x8168000 .4byte Route12_MapConnections @ 0x8352B60 .2byte BGM_FRLG_ROUTE_11 .2byte 100 diff --git a/data/maps/Route12_FishingHouse/header.inc b/data/maps/Route12_FishingHouse/header.inc index a7c27f49d..31fa7f94d 100644 --- a/data/maps/Route12_FishingHouse/header.inc +++ b/data/maps/Route12_FishingHouse/header.inc @@ -1,7 +1,7 @@ Route12_FishingHouse:: @ 8351958 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_Route12_FishingHouse @ 0x83BDB48 - .4byte gMapScripts_Route12_FishingHouse @ 0x816FF0B + .4byte Route12_FishingHouse_MapEvents @ 0x83BDB48 + .4byte Route12_FishingHouse_MapScripts @ 0x816FF0B .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 13 diff --git a/data/maps/Route12_NorthEntrance_1F/header.inc b/data/maps/Route12_NorthEntrance_1F/header.inc index f3a501887..60a2f30e5 100644 --- a/data/maps/Route12_NorthEntrance_1F/header.inc +++ b/data/maps/Route12_NorthEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route12_NorthEntrance_1F:: @ 8351920 .4byte Route12_NorthEntrance_1F_Layout @ 0x8319DF0 - .4byte gMapEvents_Route12_NorthEntrance_1F @ 0x83BDAAC - .4byte gMapScripts_Route12_NorthEntrance_1F @ 0x816FE6D + .4byte Route12_NorthEntrance_1F_MapEvents @ 0x83BDAAC + .4byte Route12_NorthEntrance_1F_MapScripts @ 0x816FE6D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 176 diff --git a/data/maps/Route12_NorthEntrance_2F/header.inc b/data/maps/Route12_NorthEntrance_2F/header.inc index deb9655e1..00a195bd2 100644 --- a/data/maps/Route12_NorthEntrance_2F/header.inc +++ b/data/maps/Route12_NorthEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route12_NorthEntrance_2F:: @ 835193C .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route12_NorthEntrance_2F @ 0x83BDAF8 - .4byte gMapScripts_Route12_NorthEntrance_2F @ 0x816FE77 + .4byte Route12_NorthEntrance_2F_MapEvents @ 0x83BDAF8 + .4byte Route12_NorthEntrance_2F_MapScripts @ 0x816FE77 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route13/header.inc b/data/maps/Route13/header.inc index 2f98d6d15..854f41328 100644 --- a/data/maps/Route13/header.inc +++ b/data/maps/Route13/header.inc @@ -1,7 +1,7 @@ Route13:: @ 835097C .4byte Route13_Layout @ 0x82EF13C - .4byte gMapEvents_Route13 @ 0x83B7428 - .4byte gMapScripts_Route13 @ 0x81680B5 + .4byte Route13_MapEvents @ 0x83B7428 + .4byte Route13_MapScripts @ 0x81680B5 .4byte Route13_MapConnections @ 0x8352B80 .2byte BGM_FRLG_ROUTE_11 .2byte 101 diff --git a/data/maps/Route14/header.inc b/data/maps/Route14/header.inc index 5fe549443..4dc8ad571 100644 --- a/data/maps/Route14/header.inc +++ b/data/maps/Route14/header.inc @@ -1,7 +1,7 @@ Route14:: @ 8350998 .4byte Route14_Layout @ 0x82EFCA0 - .4byte gMapEvents_Route14 @ 0x83B75C8 - .4byte gMapScripts_Route14 @ 0x81680D1 + .4byte Route14_MapEvents @ 0x83B75C8 + .4byte Route14_MapScripts @ 0x81680D1 .4byte Route14_MapConnections @ 0x8352BA0 .2byte BGM_FRLG_ROUTE_11 .2byte 102 diff --git a/data/maps/Route15/header.inc b/data/maps/Route15/header.inc index 12dc0221c..c1fc1f9cd 100644 --- a/data/maps/Route15/header.inc +++ b/data/maps/Route15/header.inc @@ -1,7 +1,7 @@ Route15:: @ 83509B4 .4byte Route15_Layout @ 0x82F0804 - .4byte gMapEvents_Route15 @ 0x83B7748 - .4byte gMapScripts_Route15 @ 0x81680DB + .4byte Route15_MapEvents @ 0x83B7748 + .4byte Route15_MapScripts @ 0x81680DB .4byte Route15_MapConnections @ 0x8352BC0 .2byte BGM_FRLG_ROUTE_11 .2byte 103 diff --git a/data/maps/Route15_WestEntrance_1F/header.inc b/data/maps/Route15_WestEntrance_1F/header.inc index 9c8348b58..7e3573609 100644 --- a/data/maps/Route15_WestEntrance_1F/header.inc +++ b/data/maps/Route15_WestEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route15_WestEntrance_1F:: @ 8351974 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route15_WestEntrance_1F @ 0x83BDB9C - .4byte gMapScripts_Route15_WestEntrance_1F @ 0x8170088 + .4byte Route15_WestEntrance_1F_MapEvents @ 0x83BDB9C + .4byte Route15_WestEntrance_1F_MapScripts @ 0x8170088 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 224 diff --git a/data/maps/Route15_WestEntrance_2F/header.inc b/data/maps/Route15_WestEntrance_2F/header.inc index 3be6a3320..7bd72a5b8 100644 --- a/data/maps/Route15_WestEntrance_2F/header.inc +++ b/data/maps/Route15_WestEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route15_WestEntrance_2F:: @ 8351990 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route15_WestEntrance_2F @ 0x83BDBE8 - .4byte gMapScripts_Route15_WestEntrance_2F @ 0x8170092 + .4byte Route15_WestEntrance_2F_MapEvents @ 0x83BDBE8 + .4byte Route15_WestEntrance_2F_MapScripts @ 0x8170092 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route16/header.inc b/data/maps/Route16/header.inc index 8b6cd97fe..71785a7a5 100644 --- a/data/maps/Route16/header.inc +++ b/data/maps/Route16/header.inc @@ -1,7 +1,7 @@ Route16:: @ 83509D0 .4byte Route16_Layout @ 0x82F0FA8 - .4byte gMapEvents_Route16 @ 0x83B7898 - .4byte gMapScripts_Route16 @ 0x81680E5 + .4byte Route16_MapEvents @ 0x83B7898 + .4byte Route16_MapScripts @ 0x81680E5 .4byte Route16_MapConnections @ 0x8352BE0 .2byte BGM_FRLG_ROUTE_3 .2byte 104 diff --git a/data/maps/Route16_House/header.inc b/data/maps/Route16_House/header.inc index 473deb93f..3fd158b04 100644 --- a/data/maps/Route16_House/header.inc +++ b/data/maps/Route16_House/header.inc @@ -1,7 +1,7 @@ Route16_House:: @ 83519AC .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_Route16_House @ 0x83BDC44 - .4byte gMapScripts_Route16_House @ 0x817014E + .4byte Route16_House_MapEvents @ 0x83BDC44 + .4byte Route16_House_MapScripts @ 0x817014E .4byte NULL .2byte BGM_FRLG_CELADON_CITY .2byte 6 diff --git a/data/maps/Route16_NorthEntrance_1F/header.inc b/data/maps/Route16_NorthEntrance_1F/header.inc index b0f6c815b..fffac64b8 100644 --- a/data/maps/Route16_NorthEntrance_1F/header.inc +++ b/data/maps/Route16_NorthEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route16_NorthEntrance_1F:: @ 83519C8 .4byte Route16_NorthEntrance_1F_Layout @ 0x8320D14 - .4byte gMapEvents_Route16_NorthEntrance_1F @ 0x83BDD60 - .4byte gMapScripts_Route16_NorthEntrance_1F @ 0x81701C2 + .4byte Route16_NorthEntrance_1F_MapEvents @ 0x83BDD60 + .4byte Route16_NorthEntrance_1F_MapScripts @ 0x81701C2 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 223 diff --git a/data/maps/Route16_NorthEntrance_2F/header.inc b/data/maps/Route16_NorthEntrance_2F/header.inc index 91998b7ce..ea494e816 100644 --- a/data/maps/Route16_NorthEntrance_2F/header.inc +++ b/data/maps/Route16_NorthEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route16_NorthEntrance_2F:: @ 83519E4 .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route16_NorthEntrance_2F @ 0x83BDDDC - .4byte gMapScripts_Route16_NorthEntrance_2F @ 0x81702BE + .4byte Route16_NorthEntrance_2F_MapEvents @ 0x83BDDDC + .4byte Route16_NorthEntrance_2F_MapScripts @ 0x81702BE .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route17/header.inc b/data/maps/Route17/header.inc index 1794580a8..ae76e440e 100644 --- a/data/maps/Route17/header.inc +++ b/data/maps/Route17/header.inc @@ -1,7 +1,7 @@ Route17:: @ 83509EC .4byte Route17_Layout @ 0x82F2DCC - .4byte gMapEvents_Route17 @ 0x83B7A20 - .4byte gMapScripts_Route17 @ 0x81681BF + .4byte Route17_MapEvents @ 0x83B7A20 + .4byte Route17_MapScripts @ 0x81681BF .4byte Route17_MapConnections @ 0x8352C00 .2byte BGM_FRLG_ROUTE_3 .2byte 105 diff --git a/data/maps/Route18/header.inc b/data/maps/Route18/header.inc index 9ca9d432b..b4861fdf1 100644 --- a/data/maps/Route18/header.inc +++ b/data/maps/Route18/header.inc @@ -1,7 +1,7 @@ Route18:: @ 8350A08 .4byte Route18_Layout @ 0x82F3750 - .4byte gMapEvents_Route18 @ 0x83B7AA4 - .4byte gMapScripts_Route18 @ 0x81681F6 + .4byte Route18_MapEvents @ 0x83B7AA4 + .4byte Route18_MapScripts @ 0x81681F6 .4byte Route18_MapConnections @ 0x8352C20 .2byte BGM_FRLG_ROUTE_3 .2byte 106 diff --git a/data/maps/Route18_EastEntrance_1F/header.inc b/data/maps/Route18_EastEntrance_1F/header.inc index 74e8f827f..87cf71cf7 100644 --- a/data/maps/Route18_EastEntrance_1F/header.inc +++ b/data/maps/Route18_EastEntrance_1F/header.inc @@ -1,7 +1,7 @@ Route18_EastEntrance_1F:: @ 8351A00 .4byte Entrance_1F_Layout @ 0x8320E70 - .4byte gMapEvents_Route18_EastEntrance_1F @ 0x83BDED0 - .4byte gMapScripts_Route18_EastEntrance_1F @ 0x8170378 + .4byte Route18_EastEntrance_1F_MapEvents @ 0x83BDED0 + .4byte Route18_EastEntrance_1F_MapScripts @ 0x8170378 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 224 diff --git a/data/maps/Route18_EastEntrance_2F/header.inc b/data/maps/Route18_EastEntrance_2F/header.inc index ff41bf2da..56ed2a2a9 100644 --- a/data/maps/Route18_EastEntrance_2F/header.inc +++ b/data/maps/Route18_EastEntrance_2F/header.inc @@ -1,7 +1,7 @@ Route18_EastEntrance_2F:: @ 8351A1C .4byte Entrance_2F_Layout @ 0x8320804 - .4byte gMapEvents_Route18_EastEntrance_2F @ 0x83BDF1C - .4byte gMapScripts_Route18_EastEntrance_2F @ 0x817046B + .4byte Route18_EastEntrance_2F_MapEvents @ 0x83BDF1C + .4byte Route18_EastEntrance_2F_MapScripts @ 0x817046B .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 220 diff --git a/data/maps/Route19/header.inc b/data/maps/Route19/header.inc index 6be186f94..a141f1f92 100644 --- a/data/maps/Route19/header.inc +++ b/data/maps/Route19/header.inc @@ -1,7 +1,7 @@ Route19:: @ 8350A24 .4byte Route19_Layout @ 0x82F42B4 - .4byte gMapEvents_Route19 @ 0x83B7BE4 - .4byte gMapScripts_Route19 @ 0x8168231 + .4byte Route19_MapEvents @ 0x83B7BE4 + .4byte Route19_MapScripts @ 0x8168231 .4byte Route19_MapConnections @ 0x8352C40 .2byte BGM_FRLG_ROUTE_3 .2byte 107 diff --git a/data/maps/Route2/header.inc b/data/maps/Route2/header.inc index 2d892eab9..985fe6d72 100644 --- a/data/maps/Route2/header.inc +++ b/data/maps/Route2/header.inc @@ -1,7 +1,7 @@ Route2:: @ 8350848 .4byte Route2_Layout @ 0x82E64F0 - .4byte gMapEvents_Route2 @ 0x83B676C - .4byte gMapScripts_Route2 @ 0x8167F64 + .4byte Route2_MapEvents @ 0x83B676C + .4byte Route2_MapScripts @ 0x8167F64 .4byte Route2_MapConnections @ 0x8352A14 .2byte BGM_FRLG_ROUTE_1 .2byte 90 diff --git a/data/maps/Route20/header.inc b/data/maps/Route20/header.inc index a4b1a19bc..1b832f0cd 100644 --- a/data/maps/Route20/header.inc +++ b/data/maps/Route20/header.inc @@ -1,7 +1,7 @@ Route20:: @ 8350A40 .4byte Route20_Layout @ 0x82F5598 - .4byte gMapEvents_Route20 @ 0x83B7D34 - .4byte gMapScripts_Route20 @ 0x816823B + .4byte Route20_MapEvents @ 0x83B7D34 + .4byte Route20_MapScripts @ 0x816823B .4byte Route20_MapConnections @ 0x8352C60 .2byte BGM_FRLG_ROUTE_3 .2byte 108 diff --git a/data/maps/Route21_North/header.inc b/data/maps/Route21_North/header.inc index 728a8f92c..cf0397e8a 100644 --- a/data/maps/Route21_North/header.inc +++ b/data/maps/Route21_North/header.inc @@ -1,7 +1,7 @@ Route21_North:: @ 8350A5C .4byte Route21_North_Layout @ 0x82F5F1C - .4byte gMapEvents_Route21_North @ 0x83B7DE4 - .4byte gMapScripts_Route21_North @ 0x8168289 + .4byte Route21_North_MapEvents @ 0x83B7DE4 + .4byte Route21_North_MapScripts @ 0x8168289 .4byte Route21_North_MapConnections @ 0x8352C80 .2byte BGM_FRLG_ROUTE_3 .2byte 109 diff --git a/data/maps/Route21_South/header.inc b/data/maps/Route21_South/header.inc index c2dd83782..b81f0ec6a 100644 --- a/data/maps/Route21_South/header.inc +++ b/data/maps/Route21_South/header.inc @@ -1,7 +1,7 @@ Route21_South:: @ 8350A78 .4byte Route21_South_Layout @ 0x83206C0 - .4byte gMapEvents_Route21_South @ 0x83B7E70 - .4byte gMapScripts_Route21_South @ 0x816828A + .4byte Route21_South_MapEvents @ 0x83B7E70 + .4byte Route21_South_MapScripts @ 0x816828A .4byte Route21_South_MapConnections @ 0x8352CA0 .2byte BGM_FRLG_ROUTE_3 .2byte 219 diff --git a/data/maps/Route22/header.inc b/data/maps/Route22/header.inc index c24992f76..70942583f 100644 --- a/data/maps/Route22/header.inc +++ b/data/maps/Route22/header.inc @@ -1,7 +1,7 @@ Route22:: @ 8350A94 .4byte Route22_Layout @ 0x82F6840 - .4byte gMapEvents_Route22 @ 0x83B7F18 - .4byte gMapScripts_Route22 @ 0x816828B + .4byte Route22_MapEvents @ 0x83B7F18 + .4byte Route22_MapScripts @ 0x816828B .4byte Route22_MapConnections @ 0x8352CC0 .2byte BGM_FRLG_ROUTE_3 .2byte 110 diff --git a/data/maps/Route22_NorthEntrance/header.inc b/data/maps/Route22_NorthEntrance/header.inc index 8daef5317..3f7b86142 100644 --- a/data/maps/Route22_NorthEntrance/header.inc +++ b/data/maps/Route22_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route22_NorthEntrance:: @ 8351A54 .4byte Route22_NorthEntrance_Layout @ 0x8320B1C - .4byte gMapEvents_Route22_NorthEntrance @ 0x83BDF8C - .4byte gMapScripts_Route22_NorthEntrance @ 0x81704FB + .4byte Route22_NorthEntrance_MapEvents @ 0x83BDF8C + .4byte Route22_NorthEntrance_MapScripts @ 0x81704FB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 222 diff --git a/data/maps/Route23/header.inc b/data/maps/Route23/header.inc index 3fc71fc59..2a6fa4b27 100644 --- a/data/maps/Route23/header.inc +++ b/data/maps/Route23/header.inc @@ -1,7 +1,7 @@ Route23:: @ 8350AB0 .4byte Route23_Layout @ 0x82F8664 - .4byte gMapEvents_Route23 @ 0x83B8300 - .4byte gMapScripts_Route23 @ 0x81684EB + .4byte Route23_MapEvents @ 0x83B8300 + .4byte Route23_MapScripts @ 0x81684EB .4byte Route23_MapConnections @ 0x8352CE0 .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 111 diff --git a/data/maps/Route24/header.inc b/data/maps/Route24/header.inc index 32b644009..298826eef 100644 --- a/data/maps/Route24/header.inc +++ b/data/maps/Route24/header.inc @@ -1,7 +1,7 @@ Route24:: @ 8350ACC .4byte Route24_Layout @ 0x82F8E08 - .4byte gMapEvents_Route24 @ 0x83B8400 - .4byte gMapScripts_Route24 @ 0x816861F + .4byte Route24_MapEvents @ 0x83B8400 + .4byte Route24_MapScripts @ 0x816861F .4byte Route24_MapConnections @ 0x8352D00 .2byte BGM_FRLG_ROUTE_24 .2byte 112 diff --git a/data/maps/Route25/header.inc b/data/maps/Route25/header.inc index 38df8e11d..f4525d40e 100644 --- a/data/maps/Route25/header.inc +++ b/data/maps/Route25/header.inc @@ -1,7 +1,7 @@ Route25:: @ 8350AE8 .4byte Route25_Layout @ 0x82F996C - .4byte gMapEvents_Route25 @ 0x83B8590 - .4byte gMapScripts_Route25 @ 0x8168745 + .4byte Route25_MapEvents @ 0x83B8590 + .4byte Route25_MapScripts @ 0x8168745 .4byte Route25_MapConnections @ 0x8352D14 .2byte BGM_FRLG_ROUTE_24 .2byte 113 diff --git a/data/maps/Route25_SeaCottage/header.inc b/data/maps/Route25_SeaCottage/header.inc index 9108278b2..268e6e59c 100644 --- a/data/maps/Route25_SeaCottage/header.inc +++ b/data/maps/Route25_SeaCottage/header.inc @@ -1,7 +1,7 @@ Route25_SeaCottage:: @ 8351A8C .4byte Route25_SeaCottage_Layout @ 0x8319030 - .4byte gMapEvents_Route25_SeaCottage @ 0x83BE008 - .4byte gMapScripts_Route25_SeaCottage @ 0x8170523 + .4byte Route25_SeaCottage_MapEvents @ 0x83BE008 + .4byte Route25_SeaCottage_MapScripts @ 0x8170523 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 169 diff --git a/data/maps/Route2_EastBuilding/header.inc b/data/maps/Route2_EastBuilding/header.inc index d6ffe1e28..02b30b483 100644 --- a/data/maps/Route2_EastBuilding/header.inc +++ b/data/maps/Route2_EastBuilding/header.inc @@ -1,7 +1,7 @@ Route2_EastBuilding:: @ 8351798 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_EastBuilding @ 0x83BD43C - .4byte gMapScripts_Route2_EastBuilding @ 0x816F67E + .4byte Route2_EastBuilding_MapEvents @ 0x83BD43C + .4byte Route2_EastBuilding_MapScripts @ 0x816F67E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route2_House/header.inc b/data/maps/Route2_House/header.inc index d59cf73bc..c04a3439c 100644 --- a/data/maps/Route2_House/header.inc +++ b/data/maps/Route2_House/header.inc @@ -1,7 +1,7 @@ Route2_House:: @ 835177C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_Route2_House @ 0x83BD3D8 - .4byte gMapScripts_Route2_House @ 0x816F5F8 + .4byte Route2_House_MapEvents @ 0x83BD3D8 + .4byte Route2_House_MapScripts @ 0x816F5F8 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 7 diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc index 003e21340..c460e0cca 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/header.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route2_ViridianForest_NorthEntrance:: @ 83517B4 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_ViridianForest_NorthEntrance @ 0x83BD4B8 - .4byte gMapScripts_Route2_ViridianForest_NorthEntrance @ 0x816F71D + .4byte Route2_ViridianForest_NorthEntrance_MapEvents @ 0x83BD4B8 + .4byte Route2_ViridianForest_NorthEntrance_MapScripts @ 0x816F71D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc index 133c6a43c..936b17158 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/header.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/header.inc @@ -1,7 +1,7 @@ Route2_ViridianForest_SouthEntrance:: @ 8351760 .4byte Route2_Entrance_Layout @ 0x8320990 - .4byte gMapEvents_Route2_ViridianForest_SouthEntrance @ 0x83BD37C - .4byte gMapScripts_Route2_ViridianForest_SouthEntrance @ 0x816F5E5 + .4byte Route2_ViridianForest_SouthEntrance_MapEvents @ 0x83BD37C + .4byte Route2_ViridianForest_SouthEntrance_MapScripts @ 0x816F5E5 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 221 diff --git a/data/maps/Route3/header.inc b/data/maps/Route3/header.inc index 8c33a7801..ae86378c2 100644 --- a/data/maps/Route3/header.inc +++ b/data/maps/Route3/header.inc @@ -1,7 +1,7 @@ Route3:: @ 8350864 .4byte Route3_Layout @ 0x82E7234 - .4byte gMapEvents_Route3 @ 0x83B6870 - .4byte gMapScripts_Route3 @ 0x8167F77 + .4byte Route3_MapEvents @ 0x83B6870 + .4byte Route3_MapScripts @ 0x8167F77 .4byte Route3_MapConnections @ 0x8352A34 .2byte BGM_FRLG_ROUTE_3 .2byte 91 diff --git a/data/maps/Route4/header.inc b/data/maps/Route4/header.inc index ed68203b1..7156cf616 100644 --- a/data/maps/Route4/header.inc +++ b/data/maps/Route4/header.inc @@ -1,7 +1,7 @@ Route4:: @ 8350880 .4byte Route4_Layout @ 0x82E8338 - .4byte gMapEvents_Route4 @ 0x83B6980 - .4byte gMapScripts_Route4 @ 0x8167F8A + .4byte Route4_MapEvents @ 0x83B6980 + .4byte Route4_MapScripts @ 0x8167F8A .4byte Route4_MapConnections @ 0x8352A54 .2byte BGM_FRLG_ROUTE_3 .2byte 92 diff --git a/data/maps/Route4_PokemonCenter_1F/header.inc b/data/maps/Route4_PokemonCenter_1F/header.inc index f48c8935e..fc36624b4 100644 --- a/data/maps/Route4_PokemonCenter_1F/header.inc +++ b/data/maps/Route4_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ Route4_PokemonCenter_1F:: @ 83517D0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_Route4_PokemonCenter_1F @ 0x83BD57C - .4byte gMapScripts_Route4_PokemonCenter_1F @ 0x816F739 + .4byte Route4_PokemonCenter_1F_MapEvents @ 0x83BD57C + .4byte Route4_PokemonCenter_1F_MapScripts @ 0x816F739 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/Route4_PokemonCenter_2F/header.inc b/data/maps/Route4_PokemonCenter_2F/header.inc index 8ae29faa7..eb9d2796d 100644 --- a/data/maps/Route4_PokemonCenter_2F/header.inc +++ b/data/maps/Route4_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ Route4_PokemonCenter_2F:: @ 83517EC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_Route4_PokemonCenter_2F @ 0x83BD608 - .4byte gMapScripts_Route4_PokemonCenter_2F @ 0x816F8D8 + .4byte Route4_PokemonCenter_2F_MapEvents @ 0x83BD608 + .4byte Route4_PokemonCenter_2F_MapScripts @ 0x816F8D8 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/Route5/header.inc b/data/maps/Route5/header.inc index e688654a4..7092ca60b 100644 --- a/data/maps/Route5/header.inc +++ b/data/maps/Route5/header.inc @@ -1,7 +1,7 @@ Route5:: @ 835089C .4byte Route5_Layout @ 0x82E925C - .4byte gMapEvents_Route5 @ 0x83B69C0 - .4byte gMapScripts_Route5 @ 0x8167FA7 + .4byte Route5_MapEvents @ 0x83B69C0 + .4byte Route5_MapScripts @ 0x8167FA7 .4byte Route5_MapConnections @ 0x8352A74 .2byte BGM_FRLG_ROUTE_3 .2byte 93 diff --git a/data/maps/Route5_PokemonDayCare/header.inc b/data/maps/Route5_PokemonDayCare/header.inc index 5d2affab9..3fef23ccb 100644 --- a/data/maps/Route5_PokemonDayCare/header.inc +++ b/data/maps/Route5_PokemonDayCare/header.inc @@ -1,7 +1,7 @@ Route5_PokemonDayCare:: @ 8351808 .4byte Route5_PokemonDayCare_Layout @ 0x833ADC0 - .4byte gMapEvents_Route5_PokemonDayCare @ 0x83BD64C - .4byte gMapScripts_Route5_PokemonDayCare @ 0x816F8FF + .4byte Route5_PokemonDayCare_MapEvents @ 0x83BD64C + .4byte Route5_PokemonDayCare_MapScripts @ 0x816F8FF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 275 diff --git a/data/maps/Route5_SouthEntrance/header.inc b/data/maps/Route5_SouthEntrance/header.inc index 4617ef84b..c918b3b50 100644 --- a/data/maps/Route5_SouthEntrance/header.inc +++ b/data/maps/Route5_SouthEntrance/header.inc @@ -1,7 +1,7 @@ Route5_SouthEntrance:: @ 8351824 .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte gMapEvents_Route5_SouthEntrance @ 0x83BD6C8 - .4byte gMapScripts_Route5_SouthEntrance @ 0x816F900 + .4byte Route5_SouthEntrance_MapEvents @ 0x83BD6C8 + .4byte Route5_SouthEntrance_MapScripts @ 0x816F900 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 208 diff --git a/data/maps/Route6/header.inc b/data/maps/Route6/header.inc index 5d29ba552..8e2668411 100644 --- a/data/maps/Route6/header.inc +++ b/data/maps/Route6/header.inc @@ -1,7 +1,7 @@ Route6:: @ 83508B8 .4byte Route6_Layout @ 0x82E9A00 - .4byte gMapEvents_Route6 @ 0x83B6AA0 - .4byte gMapScripts_Route6 @ 0x8167FB1 + .4byte Route6_MapEvents @ 0x83B6AA0 + .4byte Route6_MapScripts @ 0x8167FB1 .4byte Route6_MapConnections @ 0x8352A94 .2byte BGM_FRLG_ROUTE_3 .2byte 94 diff --git a/data/maps/Route6_NorthEntrance/header.inc b/data/maps/Route6_NorthEntrance/header.inc index 1127ca878..6ef93a401 100644 --- a/data/maps/Route6_NorthEntrance/header.inc +++ b/data/maps/Route6_NorthEntrance/header.inc @@ -1,7 +1,7 @@ Route6_NorthEntrance:: @ 8351840 .4byte SaffronCity_NorthSouthEntrance_Layout @ 0x831E9C0 - .4byte gMapEvents_Route6_NorthEntrance @ 0x83BD744 - .4byte gMapScripts_Route6_NorthEntrance @ 0x816F9C6 + .4byte Route6_NorthEntrance_MapEvents @ 0x83BD744 + .4byte Route6_NorthEntrance_MapScripts @ 0x816F9C6 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 208 diff --git a/data/maps/Route7/header.inc b/data/maps/Route7/header.inc index 8e7e0472a..b7c432750 100644 --- a/data/maps/Route7/header.inc +++ b/data/maps/Route7/header.inc @@ -1,7 +1,7 @@ Route7:: @ 83508D4 .4byte Route7_Layout @ 0x82E9DE4 - .4byte gMapEvents_Route7 @ 0x83B6AF4 - .4byte gMapScripts_Route7 @ 0x8167FBB + .4byte Route7_MapEvents @ 0x83B6AF4 + .4byte Route7_MapScripts @ 0x8167FBB .4byte Route7_MapConnections @ 0x8352AB4 .2byte BGM_FRLG_ROUTE_3 .2byte 95 diff --git a/data/maps/Route7_EastEntrance/header.inc b/data/maps/Route7_EastEntrance/header.inc index 1a30930fa..6ceaa940e 100644 --- a/data/maps/Route7_EastEntrance/header.inc +++ b/data/maps/Route7_EastEntrance/header.inc @@ -1,7 +1,7 @@ Route7_EastEntrance:: @ 8351878 .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte gMapEvents_Route7_EastEntrance @ 0x83BD7D4 - .4byte gMapScripts_Route7_EastEntrance @ 0x816FA8D + .4byte Route7_EastEntrance_MapEvents @ 0x83BD7D4 + .4byte Route7_EastEntrance_MapScripts @ 0x816FA8D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 209 diff --git a/data/maps/Route8/header.inc b/data/maps/Route8/header.inc index 85bc28400..b4b9bec8d 100644 --- a/data/maps/Route8/header.inc +++ b/data/maps/Route8/header.inc @@ -1,7 +1,7 @@ Route8:: @ 83508F0 .4byte Route8_Layout @ 0x82EA948 - .4byte gMapEvents_Route8 @ 0x83B6CB0 - .4byte gMapScripts_Route8 @ 0x8167FC5 + .4byte Route8_MapEvents @ 0x83B6CB0 + .4byte Route8_MapScripts @ 0x8167FC5 .4byte Route8_MapConnections @ 0x8352AD4 .2byte BGM_FRLG_ROUTE_3 .2byte 96 diff --git a/data/maps/Route8_WestEntrance/header.inc b/data/maps/Route8_WestEntrance/header.inc index 4eb91b5bd..400f52c1c 100644 --- a/data/maps/Route8_WestEntrance/header.inc +++ b/data/maps/Route8_WestEntrance/header.inc @@ -1,7 +1,7 @@ Route8_WestEntrance:: @ 8351894 .4byte SaffronCity_EastWestEntrance_Layout @ 0x831EAD0 - .4byte gMapEvents_Route8_WestEntrance @ 0x83BD850 - .4byte gMapScripts_Route8_WestEntrance @ 0x816FB53 + .4byte Route8_WestEntrance_MapEvents @ 0x83BD850 + .4byte Route8_WestEntrance_MapScripts @ 0x816FB53 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 209 diff --git a/data/maps/Route9/header.inc b/data/maps/Route9/header.inc index 559f56a41..0066c2e2f 100644 --- a/data/maps/Route9/header.inc +++ b/data/maps/Route9/header.inc @@ -1,7 +1,7 @@ Route9:: @ 835090C .4byte Route9_Layout @ 0x82EB4AC - .4byte gMapEvents_Route9 @ 0x83B6E14 - .4byte gMapScripts_Route9 @ 0x8167FCF + .4byte Route9_MapEvents @ 0x83B6E14 + .4byte Route9_MapScripts @ 0x8167FCF .4byte Route9_MapConnections @ 0x8352AF4 .2byte BGM_FRLG_ROUTE_3 .2byte 97 diff --git a/data/maps/SSAnne_1F_Corridor/header.inc b/data/maps/SSAnne_1F_Corridor/header.inc index ee2523774..120c6e9b0 100644 --- a/data/maps/SSAnne_1F_Corridor/header.inc +++ b/data/maps/SSAnne_1F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Corridor:: @ 834F2A0 .4byte SSAnne_1F_Corridor_Layout @ 0x82FFB4C - .4byte gMapEvents_SSAnne_1F_Corridor @ 0x83AE974 - .4byte gMapScripts_SSAnne_1F_Corridor @ 0x81608CB + .4byte SSAnne_1F_Corridor_MapEvents @ 0x83AE974 + .4byte SSAnne_1F_Corridor_MapScripts @ 0x81608CB .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 119 diff --git a/data/maps/SSAnne_1F_Room1/header.inc b/data/maps/SSAnne_1F_Room1/header.inc index 1da716524..dfe367802 100644 --- a/data/maps/SSAnne_1F_Room1/header.inc +++ b/data/maps/SSAnne_1F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room1:: @ 834F364 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room1 @ 0x83AECEC - .4byte gMapScripts_SSAnne_1F_Room1 @ 0x8160BDB + .4byte SSAnne_1F_Room1_MapEvents @ 0x83AECEC + .4byte SSAnne_1F_Room1_MapScripts @ 0x8160BDB .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room11/header.inc b/data/maps/SSAnne_1F_Room11/header.inc index 86a4b43e3..b7daaaf24 100644 --- a/data/maps/SSAnne_1F_Room11/header.inc +++ b/data/maps/SSAnne_1F_Room11/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room11:: @ 834FF50 .4byte SSAnne_1F_Room11_Layout @ 0x8345030 - .4byte gMapEvents_SSAnne_1F_Room11 @ 0x83B3B34 - .4byte gMapScripts_SSAnne_1F_Room11 @ 0x8164559 + .4byte SSAnne_1F_Room11_MapEvents @ 0x83B3B34 + .4byte SSAnne_1F_Room11_MapScripts @ 0x8164559 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 317 diff --git a/data/maps/SSAnne_1F_Room12/header.inc b/data/maps/SSAnne_1F_Room12/header.inc index 0c1206221..067d21360 100644 --- a/data/maps/SSAnne_1F_Room12/header.inc +++ b/data/maps/SSAnne_1F_Room12/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room12:: @ 834FF6C .4byte SSAnne_1F_Room12_Layout @ 0x8347A50 - .4byte gMapEvents_SSAnne_1F_Room12 @ 0x83B3B50 - .4byte gMapScripts_SSAnne_1F_Room12 @ 0x81646A4 + .4byte SSAnne_1F_Room12_MapEvents @ 0x83B3B50 + .4byte SSAnne_1F_Room12_MapScripts @ 0x81646A4 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 340 diff --git a/data/maps/SSAnne_1F_Room2/header.inc b/data/maps/SSAnne_1F_Room2/header.inc index ff27c0fc5..051f27424 100644 --- a/data/maps/SSAnne_1F_Room2/header.inc +++ b/data/maps/SSAnne_1F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room2:: @ 834F380 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room2 @ 0x83AED68 - .4byte gMapScripts_SSAnne_1F_Room2 @ 0x8160BE5 + .4byte SSAnne_1F_Room2_MapEvents @ 0x83AED68 + .4byte SSAnne_1F_Room2_MapScripts @ 0x8160BE5 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room3/header.inc b/data/maps/SSAnne_1F_Room3/header.inc index 87fa83e15..0240062db 100644 --- a/data/maps/SSAnne_1F_Room3/header.inc +++ b/data/maps/SSAnne_1F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room3:: @ 834F39C .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room3 @ 0x83AEDCC - .4byte gMapScripts_SSAnne_1F_Room3 @ 0x8160C1D + .4byte SSAnne_1F_Room3_MapEvents @ 0x83AEDCC + .4byte SSAnne_1F_Room3_MapScripts @ 0x8160C1D .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room4/header.inc b/data/maps/SSAnne_1F_Room4/header.inc index 20e7592c8..18b679d2c 100644 --- a/data/maps/SSAnne_1F_Room4/header.inc +++ b/data/maps/SSAnne_1F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room4:: @ 834F3B8 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room4 @ 0x83AEE00 - .4byte gMapScripts_SSAnne_1F_Room4 @ 0x8160C43 + .4byte SSAnne_1F_Room4_MapEvents @ 0x83AEE00 + .4byte SSAnne_1F_Room4_MapScripts @ 0x8160C43 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room5/header.inc b/data/maps/SSAnne_1F_Room5/header.inc index 17e6e6177..c9e14fcab 100644 --- a/data/maps/SSAnne_1F_Room5/header.inc +++ b/data/maps/SSAnne_1F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room5:: @ 834F3D4 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room5 @ 0x83AEE34 - .4byte gMapScripts_SSAnne_1F_Room5 @ 0x8160C66 + .4byte SSAnne_1F_Room5_MapEvents @ 0x83AEE34 + .4byte SSAnne_1F_Room5_MapScripts @ 0x8160C66 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room6/header.inc b/data/maps/SSAnne_1F_Room6/header.inc index 21e7d4adf..689a053ef 100644 --- a/data/maps/SSAnne_1F_Room6/header.inc +++ b/data/maps/SSAnne_1F_Room6/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room6:: @ 834F540 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room6 @ 0x83AF210 - .4byte gMapScripts_SSAnne_1F_Room6 @ 0x8160DF2 + .4byte SSAnne_1F_Room6_MapEvents @ 0x83AF210 + .4byte SSAnne_1F_Room6_MapScripts @ 0x8160DF2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_1F_Room7/header.inc b/data/maps/SSAnne_1F_Room7/header.inc index 04752a2a5..218ed0557 100644 --- a/data/maps/SSAnne_1F_Room7/header.inc +++ b/data/maps/SSAnne_1F_Room7/header.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room7:: @ 834F3F0 .4byte SSAnne_Room1_Layout @ 0x8319E74 - .4byte gMapEvents_SSAnne_1F_Room7 @ 0x83AEE68 - .4byte gMapScripts_SSAnne_1F_Room7 @ 0x8160C7E + .4byte SSAnne_1F_Room7_MapEvents @ 0x83AEE68 + .4byte SSAnne_1F_Room7_MapScripts @ 0x8160C7E .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 177 diff --git a/data/maps/SSAnne_2F_Corridor/header.inc b/data/maps/SSAnne_2F_Corridor/header.inc index 6269a69a2..6321b0246 100644 --- a/data/maps/SSAnne_2F_Corridor/header.inc +++ b/data/maps/SSAnne_2F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Corridor:: @ 834F2BC .4byte SSAnne_2F_Corridor_Layout @ 0x82FFFB0 - .4byte gMapEvents_SSAnne_2F_Corridor @ 0x83AEA30 - .4byte gMapScripts_SSAnne_2F_Corridor @ 0x81608DE + .4byte SSAnne_2F_Corridor_MapEvents @ 0x83AEA30 + .4byte SSAnne_2F_Corridor_MapScripts @ 0x81608DE .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 120 diff --git a/data/maps/SSAnne_2F_Room1/header.inc b/data/maps/SSAnne_2F_Room1/header.inc index 0c430c47e..4960880c9 100644 --- a/data/maps/SSAnne_2F_Room1/header.inc +++ b/data/maps/SSAnne_2F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room1:: @ 834F40C .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room1 @ 0x83AEE9C - .4byte gMapScripts_SSAnne_2F_Room1 @ 0x8160C96 + .4byte SSAnne_2F_Room1_MapEvents @ 0x83AEE9C + .4byte SSAnne_2F_Room1_MapScripts @ 0x8160C96 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room2/header.inc b/data/maps/SSAnne_2F_Room2/header.inc index 9a9e944e1..df8bd334f 100644 --- a/data/maps/SSAnne_2F_Room2/header.inc +++ b/data/maps/SSAnne_2F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room2:: @ 834F428 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room2 @ 0x83AEF00 - .4byte gMapScripts_SSAnne_2F_Room2 @ 0x8160CB0 + .4byte SSAnne_2F_Room2_MapEvents @ 0x83AEF00 + .4byte SSAnne_2F_Room2_MapScripts @ 0x8160CB0 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room3/header.inc b/data/maps/SSAnne_2F_Room3/header.inc index 6d749d6e0..9d3cb6e63 100644 --- a/data/maps/SSAnne_2F_Room3/header.inc +++ b/data/maps/SSAnne_2F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room3:: @ 834F444 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room3 @ 0x83AEF4C - .4byte gMapScripts_SSAnne_2F_Room3 @ 0x8160CDF + .4byte SSAnne_2F_Room3_MapEvents @ 0x83AEF4C + .4byte SSAnne_2F_Room3_MapScripts @ 0x8160CDF .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room4/header.inc b/data/maps/SSAnne_2F_Room4/header.inc index 20b40d53a..d71a41336 100644 --- a/data/maps/SSAnne_2F_Room4/header.inc +++ b/data/maps/SSAnne_2F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room4:: @ 834F460 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room4 @ 0x83AEFB0 - .4byte gMapScripts_SSAnne_2F_Room4 @ 0x8160CF2 + .4byte SSAnne_2F_Room4_MapEvents @ 0x83AEFB0 + .4byte SSAnne_2F_Room4_MapScripts @ 0x8160CF2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room5/header.inc b/data/maps/SSAnne_2F_Room5/header.inc index f85f59058..76b09d983 100644 --- a/data/maps/SSAnne_2F_Room5/header.inc +++ b/data/maps/SSAnne_2F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room5:: @ 834F47C .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room5 @ 0x83AEFFC - .4byte gMapScripts_SSAnne_2F_Room5 @ 0x8160D21 + .4byte SSAnne_2F_Room5_MapEvents @ 0x83AEFFC + .4byte SSAnne_2F_Room5_MapScripts @ 0x8160D21 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_2F_Room6/header.inc b/data/maps/SSAnne_2F_Room6/header.inc index b469ade44..29cb434c7 100644 --- a/data/maps/SSAnne_2F_Room6/header.inc +++ b/data/maps/SSAnne_2F_Room6/header.inc @@ -1,7 +1,7 @@ SSAnne_2F_Room6:: @ 834F498 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_2F_Room6 @ 0x83AF048 - .4byte gMapScripts_SSAnne_2F_Room6 @ 0x8160D34 + .4byte SSAnne_2F_Room6_MapEvents @ 0x83AF048 + .4byte SSAnne_2F_Room6_MapScripts @ 0x8160D34 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_3F_Corridor/header.inc b/data/maps/SSAnne_3F_Corridor/header.inc index 542dd9301..e5285ffe9 100644 --- a/data/maps/SSAnne_3F_Corridor/header.inc +++ b/data/maps/SSAnne_3F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_3F_Corridor:: @ 834F2D8 .4byte SSAnne_3F_Corridor_Layout @ 0x8300108 - .4byte gMapEvents_SSAnne_3F_Corridor @ 0x83AEA74 - .4byte gMapScripts_SSAnne_3F_Corridor @ 0x8160A5D + .4byte SSAnne_3F_Corridor_MapEvents @ 0x83AEA74 + .4byte SSAnne_3F_Corridor_MapScripts @ 0x8160A5D .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 121 diff --git a/data/maps/SSAnne_B1F_Corridor/header.inc b/data/maps/SSAnne_B1F_Corridor/header.inc index af25e7b96..020aa1ad4 100644 --- a/data/maps/SSAnne_B1F_Corridor/header.inc +++ b/data/maps/SSAnne_B1F_Corridor/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Corridor:: @ 834F2F4 .4byte SSAnne_B1F_Corridor_Layout @ 0x8300270 - .4byte gMapEvents_SSAnne_B1F_Corridor @ 0x83AEAC4 - .4byte gMapScripts_SSAnne_B1F_Corridor @ 0x8160A67 + .4byte SSAnne_B1F_Corridor_MapEvents @ 0x83AEAC4 + .4byte SSAnne_B1F_Corridor_MapScripts @ 0x8160A67 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 122 diff --git a/data/maps/SSAnne_B1F_Room1/header.inc b/data/maps/SSAnne_B1F_Room1/header.inc index 33e35bdf8..609acf59e 100644 --- a/data/maps/SSAnne_B1F_Room1/header.inc +++ b/data/maps/SSAnne_B1F_Room1/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room1:: @ 834F4B4 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room1 @ 0x83AF094 - .4byte gMapScripts_SSAnne_B1F_Room1 @ 0x8160D47 + .4byte SSAnne_B1F_Room1_MapEvents @ 0x83AF094 + .4byte SSAnne_B1F_Room1_MapScripts @ 0x8160D47 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room2/header.inc b/data/maps/SSAnne_B1F_Room2/header.inc index 86a3cac32..d7a4a9e7f 100644 --- a/data/maps/SSAnne_B1F_Room2/header.inc +++ b/data/maps/SSAnne_B1F_Room2/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room2:: @ 834F4D0 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room2 @ 0x83AF0E0 - .4byte gMapScripts_SSAnne_B1F_Room2 @ 0x8160D76 + .4byte SSAnne_B1F_Room2_MapEvents @ 0x83AF0E0 + .4byte SSAnne_B1F_Room2_MapScripts @ 0x8160D76 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room3/header.inc b/data/maps/SSAnne_B1F_Room3/header.inc index f5ab0a506..67e43de94 100644 --- a/data/maps/SSAnne_B1F_Room3/header.inc +++ b/data/maps/SSAnne_B1F_Room3/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room3:: @ 834F4EC .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room3 @ 0x83AF12C - .4byte gMapScripts_SSAnne_B1F_Room3 @ 0x8160D8E + .4byte SSAnne_B1F_Room3_MapEvents @ 0x83AF12C + .4byte SSAnne_B1F_Room3_MapScripts @ 0x8160D8E .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room4/header.inc b/data/maps/SSAnne_B1F_Room4/header.inc index 9b8dc59c7..8a23b71f2 100644 --- a/data/maps/SSAnne_B1F_Room4/header.inc +++ b/data/maps/SSAnne_B1F_Room4/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room4:: @ 834F508 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room4 @ 0x83AF178 - .4byte gMapScripts_SSAnne_B1F_Room4 @ 0x8160DA6 + .4byte SSAnne_B1F_Room4_MapEvents @ 0x83AF178 + .4byte SSAnne_B1F_Room4_MapScripts @ 0x8160DA6 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_B1F_Room5/header.inc b/data/maps/SSAnne_B1F_Room5/header.inc index 82dd62873..86c82dabe 100644 --- a/data/maps/SSAnne_B1F_Room5/header.inc +++ b/data/maps/SSAnne_B1F_Room5/header.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room5:: @ 834F524 .4byte SSAnne_Room2_Layout @ 0x8319F04 - .4byte gMapEvents_SSAnne_B1F_Room5 @ 0x83AF1DC - .4byte gMapScripts_SSAnne_B1F_Room5 @ 0x8160DD5 + .4byte SSAnne_B1F_Room5_MapEvents @ 0x83AF1DC + .4byte SSAnne_B1F_Room5_MapScripts @ 0x8160DD5 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 178 diff --git a/data/maps/SSAnne_CaptainsOffice/header.inc b/data/maps/SSAnne_CaptainsOffice/header.inc index 34c346691..b9f3fba89 100644 --- a/data/maps/SSAnne_CaptainsOffice/header.inc +++ b/data/maps/SSAnne_CaptainsOffice/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice:: @ 834F348 .4byte SSAnne_CaptainsOffice_Layout @ 0x83192EC - .4byte gMapEvents_SSAnne_CaptainsOffice @ 0x83AECB8 - .4byte gMapScripts_SSAnne_CaptainsOffice @ 0x8160B39 + .4byte SSAnne_CaptainsOffice_MapEvents @ 0x83AECB8 + .4byte SSAnne_CaptainsOffice_MapScripts @ 0x8160B39 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 171 diff --git a/data/maps/SSAnne_CaptainsOffice2/header.inc b/data/maps/SSAnne_CaptainsOffice2/header.inc index de121229e..9d29a439b 100644 --- a/data/maps/SSAnne_CaptainsOffice2/header.inc +++ b/data/maps/SSAnne_CaptainsOffice2/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice2:: @ 834FE54 .4byte SSAnne_CaptainsOffice2_Layout @ 0x8341560 - .4byte gMapEvents_SSAnne_CaptainsOffice2 @ 0x83B3508 - .4byte gMapScripts_SSAnne_CaptainsOffice2 @ 0x8163D81 + .4byte SSAnne_CaptainsOffice2_MapEvents @ 0x83B3508 + .4byte SSAnne_CaptainsOffice2_MapScripts @ 0x8163D81 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 295 diff --git a/data/maps/SSAnne_CaptainsOffice3/header.inc b/data/maps/SSAnne_CaptainsOffice3/header.inc index 393ee9983..47d48f1ec 100644 --- a/data/maps/SSAnne_CaptainsOffice3/header.inc +++ b/data/maps/SSAnne_CaptainsOffice3/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice3:: @ 834FE70 .4byte SSAnne_CaptainsOffice3_Layout @ 0x8341A98 - .4byte gMapEvents_SSAnne_CaptainsOffice3 @ 0x83B35B4 - .4byte gMapScripts_SSAnne_CaptainsOffice3 @ 0x8163D82 + .4byte SSAnne_CaptainsOffice3_MapEvents @ 0x83B35B4 + .4byte SSAnne_CaptainsOffice3_MapScripts @ 0x8163D82 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 296 diff --git a/data/maps/SSAnne_CaptainsOffice4/header.inc b/data/maps/SSAnne_CaptainsOffice4/header.inc index 2f10ad142..933c78555 100644 --- a/data/maps/SSAnne_CaptainsOffice4/header.inc +++ b/data/maps/SSAnne_CaptainsOffice4/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice4:: @ 834FE8C .4byte SSAnne_CaptainsOffice4_Layout @ 0x83405A4 - .4byte gMapEvents_SSAnne_CaptainsOffice4 @ 0x83B381C - .4byte gMapScripts_SSAnne_CaptainsOffice4 @ 0x8163F2E + .4byte SSAnne_CaptainsOffice4_MapEvents @ 0x83B381C + .4byte SSAnne_CaptainsOffice4_MapScripts @ 0x8163F2E .4byte NULL .2byte BGM_FRLG_ROCKET_HIDEOUT .2byte 292 diff --git a/data/maps/SSAnne_CaptainsOffice5/header.inc b/data/maps/SSAnne_CaptainsOffice5/header.inc index c603c103d..c735393a0 100644 --- a/data/maps/SSAnne_CaptainsOffice5/header.inc +++ b/data/maps/SSAnne_CaptainsOffice5/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice5:: @ 834FEA8 .4byte SSAnne_CaptainsOffice5_Layout @ 0x83436C4 - .4byte gMapEvents_SSAnne_CaptainsOffice5 @ 0x83B3850 - .4byte gMapScripts_SSAnne_CaptainsOffice5 @ 0x8164182 + .4byte SSAnne_CaptainsOffice5_MapEvents @ 0x83B3850 + .4byte SSAnne_CaptainsOffice5_MapScripts @ 0x8164182 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 309 diff --git a/data/maps/SSAnne_CaptainsOffice9/header.inc b/data/maps/SSAnne_CaptainsOffice9/header.inc index 3354834a2..5d4aad26b 100644 --- a/data/maps/SSAnne_CaptainsOffice9/header.inc +++ b/data/maps/SSAnne_CaptainsOffice9/header.inc @@ -1,7 +1,7 @@ SSAnne_CaptainsOffice9:: @ 834FF18 .4byte SSAnne_CaptainsOffice9_Layout @ 0x8343BD4 - .4byte gMapEvents_SSAnne_CaptainsOffice9 @ 0x83B3970 - .4byte gMapScripts_SSAnne_CaptainsOffice9 @ 0x81641B3 + .4byte SSAnne_CaptainsOffice9_MapEvents @ 0x83B3970 + .4byte SSAnne_CaptainsOffice9_MapScripts @ 0x81641B3 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 313 diff --git a/data/maps/SSAnne_Deck/header.inc b/data/maps/SSAnne_Deck/header.inc index 5c38770bd..ae12f7727 100644 --- a/data/maps/SSAnne_Deck/header.inc +++ b/data/maps/SSAnne_Deck/header.inc @@ -1,7 +1,7 @@ SSAnne_Deck:: @ 834F310 .4byte SSAnne_Deck_Layout @ 0x8300624 - .4byte gMapEvents_SSAnne_Deck @ 0x83AEB60 - .4byte gMapScripts_SSAnne_Deck @ 0x8160A68 + .4byte SSAnne_Deck_MapEvents @ 0x83AEB60 + .4byte SSAnne_Deck_MapScripts @ 0x8160A68 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 123 diff --git a/data/maps/SSAnne_Exterior/header.inc b/data/maps/SSAnne_Exterior/header.inc index 9ad5649b9..a16473ca7 100644 --- a/data/maps/SSAnne_Exterior/header.inc +++ b/data/maps/SSAnne_Exterior/header.inc @@ -1,7 +1,7 @@ SSAnne_Exterior:: @ 834F284 .4byte SSAnne_Exterior_Layout @ 0x82FF610 - .4byte gMapEvents_SSAnne_Exterior @ 0x83AE8C8 - .4byte gMapScripts_SSAnne_Exterior @ 0x8160840 + .4byte SSAnne_Exterior_MapEvents @ 0x83AE8C8 + .4byte SSAnne_Exterior_MapScripts @ 0x8160840 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 118 diff --git a/data/maps/SSAnne_Kitchen/header.inc b/data/maps/SSAnne_Kitchen/header.inc index ca1ae5f2f..a2128fe93 100644 --- a/data/maps/SSAnne_Kitchen/header.inc +++ b/data/maps/SSAnne_Kitchen/header.inc @@ -1,7 +1,7 @@ SSAnne_Kitchen:: @ 834F32C .4byte SSAnne_Kitchen_Layout @ 0x8319214 - .4byte gMapEvents_SSAnne_Kitchen @ 0x83AEC60 - .4byte gMapScripts_SSAnne_Kitchen @ 0x8160AB2 + .4byte SSAnne_Kitchen_MapEvents @ 0x83AEC60 + .4byte SSAnne_Kitchen_MapScripts @ 0x8160AB2 .4byte NULL .2byte BGM_FRLG_SS_ANNE .2byte 170 diff --git a/data/maps/SSAnne_Kitchen3/header.inc b/data/maps/SSAnne_Kitchen3/header.inc index c017888c2..de8d49593 100644 --- a/data/maps/SSAnne_Kitchen3/header.inc +++ b/data/maps/SSAnne_Kitchen3/header.inc @@ -1,7 +1,7 @@ SSAnne_Kitchen3:: @ 834FD58 .4byte SSAnne_Kitchen3_Layout @ 0x833F304 - .4byte gMapEvents_SSAnne_Kitchen3 @ 0x83B2EE0 - .4byte gMapScripts_SSAnne_Kitchen3 @ 0x8163C45 + .4byte SSAnne_Kitchen3_MapEvents @ 0x83B2EE0 + .4byte SSAnne_Kitchen3_MapScripts @ 0x8163C45 .4byte NULL .2byte BGM_FRLG_MT_EMBER .2byte 285 diff --git a/data/maps/SafariZone_Building1/header.inc b/data/maps/SafariZone_Building1/header.inc index 039fab75c..e65a0ceb1 100644 --- a/data/maps/SafariZone_Building1/header.inc +++ b/data/maps/SafariZone_Building1/header.inc @@ -1,7 +1,7 @@ SafariZone_Building1:: @ 834F968 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building1 @ 0x83B12CC - .4byte gMapScripts_SafariZone_Building1 @ 0x81623EB + .4byte SafariZone_Building1_MapEvents @ 0x83B12CC + .4byte SafariZone_Building1_MapScripts @ 0x81623EB .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building2/header.inc b/data/maps/SafariZone_Building2/header.inc index c9d80e2c9..706671bbb 100644 --- a/data/maps/SafariZone_Building2/header.inc +++ b/data/maps/SafariZone_Building2/header.inc @@ -1,7 +1,7 @@ SafariZone_Building2:: @ 834F984 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building2 @ 0x83B1340 - .4byte gMapScripts_SafariZone_Building2 @ 0x81623FE + .4byte SafariZone_Building2_MapEvents @ 0x83B1340 + .4byte SafariZone_Building2_MapScripts @ 0x81623FE .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building3/header.inc b/data/maps/SafariZone_Building3/header.inc index 3439dc9a8..219c3a1a4 100644 --- a/data/maps/SafariZone_Building3/header.inc +++ b/data/maps/SafariZone_Building3/header.inc @@ -1,7 +1,7 @@ SafariZone_Building3:: @ 834F9A0 .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building3 @ 0x83B13CC - .4byte gMapScripts_SafariZone_Building3 @ 0x816241A + .4byte SafariZone_Building3_MapEvents @ 0x83B13CC + .4byte SafariZone_Building3_MapScripts @ 0x816241A .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Building4/header.inc b/data/maps/SafariZone_Building4/header.inc index 5f783687e..60fa37573 100644 --- a/data/maps/SafariZone_Building4/header.inc +++ b/data/maps/SafariZone_Building4/header.inc @@ -1,7 +1,7 @@ SafariZone_Building4:: @ 834F9BC .4byte SafariZone_Building_Layout @ 0x831C028 - .4byte gMapEvents_SafariZone_Building4 @ 0x83B1440 - .4byte gMapScripts_SafariZone_Building4 @ 0x8162436 + .4byte SafariZone_Building4_MapEvents @ 0x83B1440 + .4byte SafariZone_Building4_MapScripts @ 0x8162436 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 198 diff --git a/data/maps/SafariZone_Center/header.inc b/data/maps/SafariZone_Center/header.inc index 357564a36..9a2b3f5cc 100644 --- a/data/maps/SafariZone_Center/header.inc +++ b/data/maps/SafariZone_Center/header.inc @@ -1,7 +1,7 @@ SafariZone_Center:: @ 834F8F8 .4byte SafariZone_Center_Layout @ 0x830DD38 - .4byte gMapEvents_SafariZone_Center @ 0x83B0F98 - .4byte gMapScripts_SafariZone_Center @ 0x8162357 + .4byte SafariZone_Center_MapEvents @ 0x83B0F98 + .4byte SafariZone_Center_MapScripts @ 0x8162357 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 147 diff --git a/data/maps/SafariZone_East/header.inc b/data/maps/SafariZone_East/header.inc index 4a1093a74..63835d624 100644 --- a/data/maps/SafariZone_East/header.inc +++ b/data/maps/SafariZone_East/header.inc @@ -1,7 +1,7 @@ SafariZone_East:: @ 834F914 .4byte SafariZone_East_Layout @ 0x830EC24 - .4byte gMapEvents_SafariZone_East @ 0x83B1068 - .4byte gMapScripts_SafariZone_East @ 0x816237C + .4byte SafariZone_East_MapEvents @ 0x83B1068 + .4byte SafariZone_East_MapScripts @ 0x816237C .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 148 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index 76f71d005..35ceb0989 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -1,7 +1,7 @@ SafariZone_North:: @ 834F930 .4byte SafariZone_North_Layout @ 0x830FE1C - .4byte gMapEvents_SafariZone_North @ 0x83B1168 - .4byte gMapScripts_SafariZone_North @ 0x8162398 + .4byte SafariZone_North_MapEvents @ 0x83B1168 + .4byte SafariZone_North_MapScripts @ 0x8162398 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 149 diff --git a/data/maps/SafariZone_SecretHouse/header.inc b/data/maps/SafariZone_SecretHouse/header.inc index 61593dc82..f91bc7a7b 100644 --- a/data/maps/SafariZone_SecretHouse/header.inc +++ b/data/maps/SafariZone_SecretHouse/header.inc @@ -1,7 +1,7 @@ SafariZone_SecretHouse:: @ 834F9D8 .4byte SafariZone_SecretHouse_Layout @ 0x831C16C - .4byte gMapEvents_SafariZone_SecretHouse @ 0x83B1484 - .4byte gMapScripts_SafariZone_SecretHouse @ 0x8162452 + .4byte SafariZone_SecretHouse_MapEvents @ 0x83B1484 + .4byte SafariZone_SecretHouse_MapScripts @ 0x8162452 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 199 diff --git a/data/maps/SafariZone_West/header.inc b/data/maps/SafariZone_West/header.inc index 2b2fd6450..69547c067 100644 --- a/data/maps/SafariZone_West/header.inc +++ b/data/maps/SafariZone_West/header.inc @@ -1,7 +1,7 @@ SafariZone_West:: @ 834F94C .4byte SafariZone_West_Layout @ 0x8310BC4 - .4byte gMapEvents_SafariZone_West @ 0x83B1270 - .4byte gMapScripts_SafariZone_West @ 0x81623C6 + .4byte SafariZone_West_MapEvents @ 0x83B1270 + .4byte SafariZone_West_MapScripts @ 0x81623C6 .4byte NULL .2byte BGM_FRLG_SAFARI_ZONE .2byte 150 diff --git a/data/maps/SaffronCity/header.inc b/data/maps/SaffronCity/header.inc index d2f20906d..79a6bb684 100644 --- a/data/maps/SaffronCity/header.inc +++ b/data/maps/SaffronCity/header.inc @@ -1,7 +1,7 @@ SaffronCity:: @ 835074C .4byte SaffronCity_Layout @ 0x82E4E28 - .4byte gMapEvents_SaffronCity @ 0x83B5EB0 - .4byte gMapScripts_SaffronCity @ 0x8167483 + .4byte SaffronCity_MapEvents @ 0x83B5EB0 + .4byte SaffronCity_MapScripts @ 0x8167483 .4byte SaffronCity_MapConnections @ 0x835292C .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 88 diff --git a/data/maps/SaffronCity_Dojo/header.inc b/data/maps/SaffronCity_Dojo/header.inc index 6710c616d..a56af7e4a 100644 --- a/data/maps/SaffronCity_Dojo/header.inc +++ b/data/maps/SaffronCity_Dojo/header.inc @@ -1,7 +1,7 @@ SaffronCity_Dojo:: @ 8351680 .4byte SaffronCity_Dojo_Layout @ 0x83212C4 - .4byte gMapEvents_SaffronCity_Dojo @ 0x83BCD60 - .4byte gMapScripts_SaffronCity_Dojo @ 0x816EBDB + .4byte SaffronCity_Dojo_MapEvents @ 0x83BCD60 + .4byte SaffronCity_Dojo_MapScripts @ 0x816EBDB .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 228 diff --git a/data/maps/SaffronCity_Duplicate/header.inc b/data/maps/SaffronCity_Duplicate/header.inc index 62cb00b04..071683449 100644 --- a/data/maps/SaffronCity_Duplicate/header.inc +++ b/data/maps/SaffronCity_Duplicate/header.inc @@ -1,7 +1,7 @@ SaffronCity_Duplicate:: @ 8350730 .4byte SaffronCity_Duplicate_Layout @ 0x831E8D4 - .4byte gMapEvents_SaffronCity_Duplicate @ 0x83B5E9C - .4byte gMapScripts_SaffronCity_Duplicate @ 0x816735F + .4byte SaffronCity_Duplicate_MapEvents @ 0x83B5E9C + .4byte SaffronCity_Duplicate_MapScripts @ 0x816735F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 207 diff --git a/data/maps/SaffronCity_Gym/header.inc b/data/maps/SaffronCity_Gym/header.inc index 78f092724..98450bd26 100644 --- a/data/maps/SaffronCity_Gym/header.inc +++ b/data/maps/SaffronCity_Gym/header.inc @@ -1,7 +1,7 @@ SaffronCity_Gym:: @ 835169C .4byte SaffronCity_Gym_Layout @ 0x82D7C44 - .4byte gMapEvents_SaffronCity_Gym @ 0x83BCF6C - .4byte gMapScripts_SaffronCity_Gym @ 0x816EDD7 + .4byte SaffronCity_Gym_MapEvents @ 0x83BCF6C + .4byte SaffronCity_Gym_MapScripts @ 0x816EDD7 .4byte NULL .2byte BGM_FRLG_GYM .2byte 34 diff --git a/data/maps/SaffronCity_House1_1F/header.inc b/data/maps/SaffronCity_House1_1F/header.inc index 594ddd6c5..a2d14cf5d 100644 --- a/data/maps/SaffronCity_House1_1F/header.inc +++ b/data/maps/SaffronCity_House1_1F/header.inc @@ -1,7 +1,7 @@ SaffronCity_House1_1F:: @ 8351648 .4byte SaffronCity_House1_1F_Layout @ 0x8321004 - .4byte gMapEvents_SaffronCity_House1_1F @ 0x83BCB9C - .4byte gMapScripts_SaffronCity_House1_1F @ 0x816EB36 + .4byte SaffronCity_House1_1F_MapEvents @ 0x83BCB9C + .4byte SaffronCity_House1_1F_MapScripts @ 0x816EB36 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 226 diff --git a/data/maps/SaffronCity_House1_2F/header.inc b/data/maps/SaffronCity_House1_2F/header.inc index 00dbee440..ceb4cf6c4 100644 --- a/data/maps/SaffronCity_House1_2F/header.inc +++ b/data/maps/SaffronCity_House1_2F/header.inc @@ -1,7 +1,7 @@ SaffronCity_House1_2F:: @ 8351664 .4byte SaffronCity_House1_2F_Layout @ 0x8321100 - .4byte gMapEvents_SaffronCity_House1_2F @ 0x83BCC3C - .4byte gMapScripts_SaffronCity_House1_2F @ 0x816EB5C + .4byte SaffronCity_House1_2F_MapEvents @ 0x83BCC3C + .4byte SaffronCity_House1_2F_MapScripts @ 0x816EB5C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 227 diff --git a/data/maps/SaffronCity_House2/header.inc b/data/maps/SaffronCity_House2/header.inc index e41fc17e7..06c30be07 100644 --- a/data/maps/SaffronCity_House2/header.inc +++ b/data/maps/SaffronCity_House2/header.inc @@ -1,7 +1,7 @@ SaffronCity_House2:: @ 83516B8 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_SaffronCity_House2 @ 0x83BD004 - .4byte gMapScripts_SaffronCity_House2 @ 0x816EF73 + .4byte SaffronCity_House2_MapEvents @ 0x83BD004 + .4byte SaffronCity_House2_MapScripts @ 0x816EF73 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 21 diff --git a/data/maps/SaffronCity_House3/header.inc b/data/maps/SaffronCity_House3/header.inc index 3662663c9..94193549c 100644 --- a/data/maps/SaffronCity_House3/header.inc +++ b/data/maps/SaffronCity_House3/header.inc @@ -1,7 +1,7 @@ SaffronCity_House3:: @ 8351728 .4byte House5_Layout @ 0x82D6AF0 - .4byte gMapEvents_SaffronCity_House3 @ 0x83BD20C - .4byte gMapScripts_SaffronCity_House3 @ 0x816F05E + .4byte SaffronCity_House3_MapEvents @ 0x83BD20C + .4byte SaffronCity_House3_MapScripts @ 0x816F05E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 21 diff --git a/data/maps/SaffronCity_Mart/header.inc b/data/maps/SaffronCity_Mart/header.inc index 55164d967..77c8555ec 100644 --- a/data/maps/SaffronCity_Mart/header.inc +++ b/data/maps/SaffronCity_Mart/header.inc @@ -1,7 +1,7 @@ SaffronCity_Mart:: @ 83516D4 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SaffronCity_Mart @ 0x83BD078 - .4byte gMapScripts_SaffronCity_Mart @ 0x816EFA2 + .4byte SaffronCity_Mart_MapEvents @ 0x83BD078 + .4byte SaffronCity_Mart_MapScripts @ 0x816EFA2 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/header.inc b/data/maps/SaffronCity_PokemonCenter_1F/header.inc index 671ea67b2..1e2198879 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/header.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonCenter_1F:: @ 83516F0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SaffronCity_PokemonCenter_1F @ 0x83BD13C - .4byte gMapScripts_SaffronCity_PokemonCenter_1F @ 0x816EFEC + .4byte SaffronCity_PokemonCenter_1F_MapEvents @ 0x83BD13C + .4byte SaffronCity_PokemonCenter_1F_MapScripts @ 0x816EFEC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/header.inc b/data/maps/SaffronCity_PokemonCenter_2F/header.inc index 7ed9818d9..8c649319e 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/header.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonCenter_2F:: @ 835170C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SaffronCity_PokemonCenter_2F @ 0x83BD1C8 - .4byte gMapScripts_SaffronCity_PokemonCenter_2F @ 0x816F037 + .4byte SaffronCity_PokemonCenter_2F_MapEvents @ 0x83BD1C8 + .4byte SaffronCity_PokemonCenter_2F_MapScripts @ 0x816F037 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc index dd5d8195f..9adb9fbb0 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/header.inc @@ -1,7 +1,7 @@ SaffronCity_PokemonTrainerFanClub:: @ 8351744 .4byte SaffronCity_PokemonTrainerFanClub_Layout @ 0x8338A60 - .4byte gMapEvents_SaffronCity_PokemonTrainerFanClub @ 0x83BD318 - .4byte gMapScripts_SaffronCity_PokemonTrainerFanClub @ 0x816F0BF + .4byte SaffronCity_PokemonTrainerFanClub_MapEvents @ 0x83BD318 + .4byte SaffronCity_PokemonTrainerFanClub_MapScripts @ 0x816F0BF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 263 diff --git a/data/maps/SeafoamIslands_1F/header.inc b/data/maps/SeafoamIslands_1F/header.inc index d6ee69b5e..f95429a3f 100644 --- a/data/maps/SeafoamIslands_1F/header.inc +++ b/data/maps/SeafoamIslands_1F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_1F:: @ 834FB28 .4byte SeafoamIslands_1F_Layout @ 0x831474C - .4byte gMapEvents_SeafoamIslands_1F @ 0x83B1E64 - .4byte gMapScripts_SeafoamIslands_1F @ 0x8162F43 + .4byte SeafoamIslands_1F_MapEvents @ 0x83B1E64 + .4byte SeafoamIslands_1F_MapScripts @ 0x8162F43 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 156 diff --git a/data/maps/SeafoamIslands_B1F/header.inc b/data/maps/SeafoamIslands_B1F/header.inc index 975adc757..b81544b6f 100644 --- a/data/maps/SeafoamIslands_B1F/header.inc +++ b/data/maps/SeafoamIslands_B1F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B1F:: @ 834FB44 .4byte SeafoamIslands_B1F_Layout @ 0x8314E44 - .4byte gMapEvents_SeafoamIslands_B1F @ 0x83B1F30 - .4byte gMapScripts_SeafoamIslands_B1F @ 0x8162F4D + .4byte SeafoamIslands_B1F_MapEvents @ 0x83B1F30 + .4byte SeafoamIslands_B1F_MapScripts @ 0x8162F4D .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 157 diff --git a/data/maps/SeafoamIslands_B2F/header.inc b/data/maps/SeafoamIslands_B2F/header.inc index 7d7f353f4..320d37873 100644 --- a/data/maps/SeafoamIslands_B2F/header.inc +++ b/data/maps/SeafoamIslands_B2F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B2F:: @ 834FB60 .4byte SeafoamIslands_B2F_Layout @ 0x8315588 - .4byte gMapEvents_SeafoamIslands_B2F @ 0x83B1FE4 - .4byte gMapScripts_SeafoamIslands_B2F @ 0x8162F4E + .4byte SeafoamIslands_B2F_MapEvents @ 0x83B1FE4 + .4byte SeafoamIslands_B2F_MapScripts @ 0x8162F4E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 158 diff --git a/data/maps/SeafoamIslands_B3F/header.inc b/data/maps/SeafoamIslands_B3F/header.inc index e19764b74..9b61d401a 100644 --- a/data/maps/SeafoamIslands_B3F/header.inc +++ b/data/maps/SeafoamIslands_B3F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B3F:: @ 834FB7C .4byte SeafoamIslands_B3F_Layout @ 0x8315CCC - .4byte gMapEvents_SeafoamIslands_B3F @ 0x83B20DC - .4byte gMapScripts_SeafoamIslands_B3F @ 0x8162F4F + .4byte SeafoamIslands_B3F_MapEvents @ 0x83B20DC + .4byte SeafoamIslands_B3F_MapScripts @ 0x8162F4F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 159 diff --git a/data/maps/SeafoamIslands_B4F/header.inc b/data/maps/SeafoamIslands_B4F/header.inc index b847158b7..67c545838 100644 --- a/data/maps/SeafoamIslands_B4F/header.inc +++ b/data/maps/SeafoamIslands_B4F/header.inc @@ -1,7 +1,7 @@ SeafoamIslands_B4F:: @ 834FB98 .4byte SeafoamIslands_B4F_Layout @ 0x8316410 - .4byte gMapEvents_SeafoamIslands_B4F @ 0x83B21C4 - .4byte gMapScripts_SeafoamIslands_B4F @ 0x816302E + .4byte SeafoamIslands_B4F_MapEvents @ 0x83B21C4 + .4byte SeafoamIslands_B4F_MapScripts @ 0x816302E .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 160 diff --git a/data/maps/SevenIsland/header.inc b/data/maps/SevenIsland/header.inc index 5838c3499..e9e478fd1 100644 --- a/data/maps/SevenIsland/header.inc +++ b/data/maps/SevenIsland/header.inc @@ -1,7 +1,7 @@ SevenIsland:: @ 83507F4 .4byte SevenIsland_Layout @ 0x8323D48 - .4byte gMapEvents_SevenIsland @ 0x83B657C - .4byte gMapScripts_SevenIsland @ 0x8167EB3 + .4byte SevenIsland_MapEvents @ 0x83B657C + .4byte SevenIsland_MapScripts @ 0x8167EB3 .4byte SevenIsland_MapConnections @ 0x83529C0 .2byte BGM_FRLG_ISLAND_SIX .2byte 235 diff --git a/data/maps/SevenIsland_Harbor/header.inc b/data/maps/SevenIsland_Harbor/header.inc index 569b25fad..fe1165d84 100644 --- a/data/maps/SevenIsland_Harbor/header.inc +++ b/data/maps/SevenIsland_Harbor/header.inc @@ -1,7 +1,7 @@ SevenIsland_Harbor:: @ 8351B50 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_SevenIsland_Harbor @ 0x83BE2A0 - .4byte gMapScripts_SevenIsland_Harbor @ 0x8170BE4 + .4byte SevenIsland_Harbor_MapEvents @ 0x83BE2A0 + .4byte SevenIsland_Harbor_MapScripts @ 0x8170BE4 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 315 diff --git a/data/maps/SevenIsland_House_Room1/header.inc b/data/maps/SevenIsland_House_Room1/header.inc index 5fd335a2d..0eeb9bc0f 100644 --- a/data/maps/SevenIsland_House_Room1/header.inc +++ b/data/maps/SevenIsland_House_Room1/header.inc @@ -1,7 +1,7 @@ SevenIsland_House_Room1:: @ 8351AA8 .4byte SevenIsland_House_Room1_Layout @ 0x834E310 - .4byte gMapEvents_SevenIsland_House_Room1 @ 0x83BE050 - .4byte gMapScripts_SevenIsland_House_Room1 @ 0x817088A + .4byte SevenIsland_House_Room1_MapEvents @ 0x83BE050 + .4byte SevenIsland_House_Room1_MapScripts @ 0x817088A .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 382 diff --git a/data/maps/SevenIsland_House_Room2/header.inc b/data/maps/SevenIsland_House_Room2/header.inc index 961157d4a..90d980166 100644 --- a/data/maps/SevenIsland_House_Room2/header.inc +++ b/data/maps/SevenIsland_House_Room2/header.inc @@ -1,7 +1,7 @@ SevenIsland_House_Room2:: @ 8351AC4 .4byte SevenIsland_House_Room2_Layout @ 0x8338C48 - .4byte gMapEvents_SevenIsland_House_Room2 @ 0x83BE084 - .4byte gMapScripts_SevenIsland_House_Room2 @ 0x8170A7E + .4byte SevenIsland_House_Room2_MapEvents @ 0x83BE084 + .4byte SevenIsland_House_Room2_MapScripts @ 0x8170A7E .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 265 diff --git a/data/maps/SevenIsland_Mart/header.inc b/data/maps/SevenIsland_Mart/header.inc index e9a0c01cd..9f2aa5ca1 100644 --- a/data/maps/SevenIsland_Mart/header.inc +++ b/data/maps/SevenIsland_Mart/header.inc @@ -1,7 +1,7 @@ SevenIsland_Mart:: @ 8351AE0 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SevenIsland_Mart @ 0x83BE100 - .4byte gMapScripts_SevenIsland_Mart @ 0x8170B30 + .4byte SevenIsland_Mart_MapEvents @ 0x83BE100 + .4byte SevenIsland_Mart_MapScripts @ 0x8170B30 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/header.inc b/data/maps/SevenIsland_PokemonCenter_1F/header.inc index edf42476e..feef23d0e 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/header.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SevenIsland_PokemonCenter_1F:: @ 8351AFC .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SevenIsland_PokemonCenter_1F @ 0x83BE1B4 - .4byte gMapScripts_SevenIsland_PokemonCenter_1F @ 0x8170B89 + .4byte SevenIsland_PokemonCenter_1F_MapEvents @ 0x83BE1B4 + .4byte SevenIsland_PokemonCenter_1F_MapScripts @ 0x8170B89 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/header.inc b/data/maps/SevenIsland_PokemonCenter_2F/header.inc index 1f5a7e0b1..523401267 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/header.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SevenIsland_PokemonCenter_2F:: @ 8351B18 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SevenIsland_PokemonCenter_2F @ 0x83BE240 - .4byte gMapScripts_SevenIsland_PokemonCenter_2F @ 0x8170BBC + .4byte SevenIsland_PokemonCenter_2F_MapEvents @ 0x83BE240 + .4byte SevenIsland_PokemonCenter_2F_MapScripts @ 0x8170BBC .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc index 29b6312f3..dc6bc05ff 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/header.inc @@ -1,7 +1,7 @@ SevenIsland_SeavaultCanyon_TanobyKey:: @ 835035C .4byte SevenIsland_SeavaultCanyon_TanobyKey_Layout @ 0x8347C54 - .4byte gMapEvents_SevenIsland_SeavaultCanyon_TanobyKey @ 0x83B48BC - .4byte gMapScripts_SevenIsland_SeavaultCanyon_TanobyKey @ 0x8164DCC + .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapEvents @ 0x83B48BC + .4byte SevenIsland_SeavaultCanyon_TanobyKey_MapScripts @ 0x8164DCC .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 341 diff --git a/data/maps/SevenIsland_SevaultCanyon/header.inc b/data/maps/SevenIsland_SevaultCanyon/header.inc index d9ac12b23..52ca532e5 100644 --- a/data/maps/SevenIsland_SevaultCanyon/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon:: @ 8350D18 .4byte SevenIsland_SevaultCanyon_Layout @ 0x8333F44 - .4byte gMapEvents_SevenIsland_SevaultCanyon @ 0x83B9618 - .4byte gMapScripts_SevenIsland_SevaultCanyon @ 0x8168BFD + .4byte SevenIsland_SevaultCanyon_MapEvents @ 0x83B9618 + .4byte SevenIsland_SevaultCanyon_MapScripts @ 0x8168BFD .4byte SevenIsland_SevaultCanyon_MapConnections @ 0x8352ED0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 256 diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc index 370efc530..5564b0943 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon_Entrance:: @ 8350CFC .4byte SevenIsland_SevaultCanyon_Entrance_Layout @ 0x8333020 - .4byte gMapEvents_SevenIsland_SevaultCanyon_Entrance @ 0x83B93FC - .4byte gMapScripts_SevenIsland_SevaultCanyon_Entrance @ 0x8168BF3 + .4byte SevenIsland_SevaultCanyon_Entrance_MapEvents @ 0x83B93FC + .4byte SevenIsland_SevaultCanyon_Entrance_MapScripts @ 0x8168BF3 .4byte SevenIsland_SevaultCanyon_Entrance_MapConnections @ 0x8352EB0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 255 diff --git a/data/maps/SevenIsland_SevaultCanyon_House/header.inc b/data/maps/SevenIsland_SevaultCanyon_House/header.inc index 7c3db6084..2adfd6a6e 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/header.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/header.inc @@ -1,7 +1,7 @@ SevenIsland_SevaultCanyon_House:: @ 8351FE8 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SevenIsland_SevaultCanyon_House @ 0x83BF3CC - .4byte gMapScripts_SevenIsland_SevaultCanyon_House @ 0x8172182 + .4byte SevenIsland_SevaultCanyon_House_MapEvents @ 0x83BF3CC + .4byte SevenIsland_SevaultCanyon_House_MapScripts @ 0x8172182 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 11 diff --git a/data/maps/SevenIsland_TanobyRuins/header.inc b/data/maps/SevenIsland_TanobyRuins/header.inc index 3593aa312..1af4d7470 100644 --- a/data/maps/SevenIsland_TanobyRuins/header.inc +++ b/data/maps/SevenIsland_TanobyRuins/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins:: @ 8350D34 .4byte SevenIsland_TanobyRuins_Layout @ 0x83355E8 - .4byte gMapEvents_SevenIsland_TanobyRuins @ 0x83B96F4 - .4byte gMapScripts_SevenIsland_TanobyRuins @ 0x8168C07 + .4byte SevenIsland_TanobyRuins_MapEvents @ 0x83B96F4 + .4byte SevenIsland_TanobyRuins_MapScripts @ 0x8168C07 .4byte SevenIsland_TanobyRuins_MapConnections @ 0x8352EE4 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 257 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc index b2409df20..ff5d89664 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_DilfordChamber:: @ 83502D0 .4byte SevenIsland_TanobyRuins_DilfordChamber_Layout @ 0x83470F8 - .4byte gMapEvents_SevenIsland_TanobyRuins_DilfordChamber @ 0x83B46EC - .4byte gMapScripts_SevenIsland_TanobyRuins_DilfordChamber @ 0x8164CF6 + .4byte SevenIsland_TanobyRuins_DilfordChamber_MapEvents @ 0x83B46EC + .4byte SevenIsland_TanobyRuins_DilfordChamber_MapScripts @ 0x8164CF6 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 338 diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc index 5e2639df1..f25b6c7b4 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_LiptooChamber:: @ 8350298 .4byte SevenIsland_TanobyRuins_LiptooChamber_Layout @ 0x8346A90 - .4byte gMapEvents_SevenIsland_TanobyRuins_LiptooChamber @ 0x83B46B4 - .4byte gMapScripts_SevenIsland_TanobyRuins_LiptooChamber @ 0x8164CDE + .4byte SevenIsland_TanobyRuins_LiptooChamber_MapEvents @ 0x83B46B4 + .4byte SevenIsland_TanobyRuins_LiptooChamber_MapScripts @ 0x8164CDE .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 336 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc index 2be9dff00..b193feafc 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_MoneanChamber:: @ 835027C .4byte SevenIsland_TanobyRuins_MoneanChamber_Layout @ 0x834675C - .4byte gMapEvents_SevenIsland_TanobyRuins_MoneanChamber @ 0x83B4698 - .4byte gMapScripts_SevenIsland_TanobyRuins_MoneanChamber @ 0x8164CCF + .4byte SevenIsland_TanobyRuins_MoneanChamber_MapEvents @ 0x83B4698 + .4byte SevenIsland_TanobyRuins_MoneanChamber_MapScripts @ 0x8164CCF .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 335 diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc index 923ab442a..815c894ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_RixyChamber:: @ 8350308 .4byte SevenIsland_TanobyRuins_RixyChamber_Layout @ 0x8349DC8 - .4byte gMapEvents_SevenIsland_TanobyRuins_RixyChamber @ 0x83B4724 - .4byte gMapScripts_SevenIsland_TanobyRuins_RixyChamber @ 0x8164D0E + .4byte SevenIsland_TanobyRuins_RixyChamber_MapEvents @ 0x83B4724 + .4byte SevenIsland_TanobyRuins_RixyChamber_MapScripts @ 0x8164D0E .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 362 diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc index 755f02e6d..66680e148 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ScufibChamber:: @ 83502EC .4byte SevenIsland_TanobyRuins_ScufibChamber_Layout @ 0x834742C - .4byte gMapEvents_SevenIsland_TanobyRuins_ScufibChamber @ 0x83B4708 - .4byte gMapScripts_SevenIsland_TanobyRuins_ScufibChamber @ 0x8164D02 + .4byte SevenIsland_TanobyRuins_ScufibChamber_MapEvents @ 0x83B4708 + .4byte SevenIsland_TanobyRuins_ScufibChamber_MapScripts @ 0x8164D02 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 339 diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc index 7d1793415..1f29dbb8f 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ViapoisChamber:: @ 8350324 .4byte SevenIsland_TanobyRuins_ViapoisChamber_Layout @ 0x834A0FC - .4byte gMapEvents_SevenIsland_TanobyRuins_ViapoisChamber @ 0x83B4740 - .4byte gMapScripts_SevenIsland_TanobyRuins_ViapoisChamber @ 0x8164D1A + .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapEvents @ 0x83B4740 + .4byte SevenIsland_TanobyRuins_ViapoisChamber_MapScripts @ 0x8164D1A .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 363 diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc index dab134f18..a6ad1c938 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/header.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_WeepthChamber:: @ 83502B4 .4byte SevenIsland_TanobyRuins_WeepthChamber_Layout @ 0x8346DC4 - .4byte gMapEvents_SevenIsland_TanobyRuins_WeepthChamber @ 0x83B46D0 - .4byte gMapScripts_SevenIsland_TanobyRuins_WeepthChamber @ 0x8164CEA + .4byte SevenIsland_TanobyRuins_WeepthChamber_MapEvents @ 0x83B46D0 + .4byte SevenIsland_TanobyRuins_WeepthChamber_MapScripts @ 0x8164CEA .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 337 diff --git a/data/maps/SevenIsland_TrainerTower/header.inc b/data/maps/SevenIsland_TrainerTower/header.inc index 41319d0b9..70ebb690e 100644 --- a/data/maps/SevenIsland_TrainerTower/header.inc +++ b/data/maps/SevenIsland_TrainerTower/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower:: @ 8350CE0 .4byte SevenIsland_TrainerTower_Layout @ 0x833287C - .4byte gMapEvents_SevenIsland_TrainerTower @ 0x83B9328 - .4byte gMapScripts_SevenIsland_TrainerTower @ 0x8168BD5 + .4byte SevenIsland_TrainerTower_MapEvents @ 0x83B9328 + .4byte SevenIsland_TrainerTower_MapScripts @ 0x8168BD5 .4byte SevenIsland_TrainerTower_MapConnections @ 0x8352E90 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 254 diff --git a/data/maps/SevenIsland_TrainerTower_1F/header.inc b/data/maps/SevenIsland_TrainerTower_1F/header.inc index 03addfd0a..5e7e742ab 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_1F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_1F:: @ 834FFA4 .4byte SevenIsland_TrainerTower_1F_Layout @ 0x8341FCC - .4byte gMapEvents_SevenIsland_TrainerTower_1F @ 0x83B3C40 - .4byte gMapScripts_SevenIsland_TrainerTower_1F @ 0x81646B8 + .4byte SevenIsland_TrainerTower_1F_MapEvents @ 0x83B3C40 + .4byte SevenIsland_TrainerTower_1F_MapScripts @ 0x81646B8 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 298 diff --git a/data/maps/SevenIsland_TrainerTower_2F/header.inc b/data/maps/SevenIsland_TrainerTower_2F/header.inc index ef4663130..b5289b39a 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_2F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_2F:: @ 834FFC0 .4byte SevenIsland_TrainerTower_2F_Layout @ 0x8342254 - .4byte gMapEvents_SevenIsland_TrainerTower_2F @ 0x83B3D14 - .4byte gMapScripts_SevenIsland_TrainerTower_2F @ 0x81646E6 + .4byte SevenIsland_TrainerTower_2F_MapEvents @ 0x83B3D14 + .4byte SevenIsland_TrainerTower_2F_MapScripts @ 0x81646E6 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 299 diff --git a/data/maps/SevenIsland_TrainerTower_3F/header.inc b/data/maps/SevenIsland_TrainerTower_3F/header.inc index f9400b21e..022a5c1d1 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_3F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_3F:: @ 834FFDC .4byte SevenIsland_TrainerTower_3F_Layout @ 0x83424DC - .4byte gMapEvents_SevenIsland_TrainerTower_3F @ 0x83B3DE8 - .4byte gMapScripts_SevenIsland_TrainerTower_3F @ 0x8164714 + .4byte SevenIsland_TrainerTower_3F_MapEvents @ 0x83B3DE8 + .4byte SevenIsland_TrainerTower_3F_MapScripts @ 0x8164714 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 300 diff --git a/data/maps/SevenIsland_TrainerTower_4F/header.inc b/data/maps/SevenIsland_TrainerTower_4F/header.inc index 82b4c0d87..cdcedee7f 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_4F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_4F:: @ 834FFF8 .4byte SevenIsland_TrainerTower_4F_Layout @ 0x8342764 - .4byte gMapEvents_SevenIsland_TrainerTower_4F @ 0x83B3EBC - .4byte gMapScripts_SevenIsland_TrainerTower_4F @ 0x8164742 + .4byte SevenIsland_TrainerTower_4F_MapEvents @ 0x83B3EBC + .4byte SevenIsland_TrainerTower_4F_MapScripts @ 0x8164742 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 301 diff --git a/data/maps/SevenIsland_TrainerTower_5F/header.inc b/data/maps/SevenIsland_TrainerTower_5F/header.inc index 9e894806f..0192b30be 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_5F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_5F:: @ 8350014 .4byte SevenIsland_TrainerTower_5F_Layout @ 0x83429EC - .4byte gMapEvents_SevenIsland_TrainerTower_5F @ 0x83B3F90 - .4byte gMapScripts_SevenIsland_TrainerTower_5F @ 0x8164770 + .4byte SevenIsland_TrainerTower_5F_MapEvents @ 0x83B3F90 + .4byte SevenIsland_TrainerTower_5F_MapScripts @ 0x8164770 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 302 diff --git a/data/maps/SevenIsland_TrainerTower_6F/header.inc b/data/maps/SevenIsland_TrainerTower_6F/header.inc index e16b71ffa..3835015a0 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_6F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_6F:: @ 8350030 .4byte SevenIsland_TrainerTower_6F_Layout @ 0x8342C74 - .4byte gMapEvents_SevenIsland_TrainerTower_6F @ 0x83B4064 - .4byte gMapScripts_SevenIsland_TrainerTower_6F @ 0x816479E + .4byte SevenIsland_TrainerTower_6F_MapEvents @ 0x83B4064 + .4byte SevenIsland_TrainerTower_6F_MapScripts @ 0x816479E .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 303 diff --git a/data/maps/SevenIsland_TrainerTower_7F/header.inc b/data/maps/SevenIsland_TrainerTower_7F/header.inc index 804576d94..2c0d405a9 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_7F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_7F:: @ 835004C .4byte SevenIsland_TrainerTower_7F_Layout @ 0x8342EFC - .4byte gMapEvents_SevenIsland_TrainerTower_7F @ 0x83B4138 - .4byte gMapScripts_SevenIsland_TrainerTower_7F @ 0x81647CC + .4byte SevenIsland_TrainerTower_7F_MapEvents @ 0x83B4138 + .4byte SevenIsland_TrainerTower_7F_MapScripts @ 0x81647CC .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 304 diff --git a/data/maps/SevenIsland_TrainerTower_8F/header.inc b/data/maps/SevenIsland_TrainerTower_8F/header.inc index a395e6b49..31ff1d39b 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/header.inc +++ b/data/maps/SevenIsland_TrainerTower_8F/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_8F:: @ 8350068 .4byte SevenIsland_TrainerTower_8F_Layout @ 0x8343184 - .4byte gMapEvents_SevenIsland_TrainerTower_8F @ 0x83B420C - .4byte gMapScripts_SevenIsland_TrainerTower_8F @ 0x81647FA + .4byte SevenIsland_TrainerTower_8F_MapEvents @ 0x83B420C + .4byte SevenIsland_TrainerTower_8F_MapScripts @ 0x81647FA .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 305 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc index da5559773..024a3656b 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Elevator:: @ 83500BC .4byte SevenIsland_TrainerTower_Elevator_Layout @ 0x8343454 - .4byte gMapEvents_SevenIsland_TrainerTower_Elevator @ 0x83B4330 - .4byte gMapScripts_SevenIsland_TrainerTower_Elevator @ 0x8164AF8 + .4byte SevenIsland_TrainerTower_Elevator_MapEvents @ 0x83B4330 + .4byte SevenIsland_TrainerTower_Elevator_MapScripts @ 0x8164AF8 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 307 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc index f62c7dfec..243fe1a15 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Lobby:: @ 83500A0 .4byte SevenIsland_TrainerTower_Lobby_Layout @ 0x8341D44 - .4byte gMapEvents_SevenIsland_TrainerTower_Lobby @ 0x83B4308 - .4byte gMapScripts_SevenIsland_TrainerTower_Lobby @ 0x8164839 + .4byte SevenIsland_TrainerTower_Lobby_MapEvents @ 0x83B4308 + .4byte SevenIsland_TrainerTower_Lobby_MapScripts @ 0x8164839 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 297 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/header.inc b/data/maps/SevenIsland_TrainerTower_Roof/header.inc index 3fdaad52f..da106ecba 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/header.inc +++ b/data/maps/SevenIsland_TrainerTower_Roof/header.inc @@ -1,7 +1,7 @@ SevenIsland_TrainerTower_Roof:: @ 8350084 .4byte SevenIsland_TrainerTower_Roof_Layout @ 0x83433E8 - .4byte gMapEvents_SevenIsland_TrainerTower_Roof @ 0x83B4248 - .4byte gMapScripts_SevenIsland_TrainerTower_Roof @ 0x8164828 + .4byte SevenIsland_TrainerTower_Roof_MapEvents @ 0x83B4248 + .4byte SevenIsland_TrainerTower_Roof_MapScripts @ 0x8164828 .4byte NULL .2byte BGM_FRLG_TRAINER_TOWER .2byte 306 diff --git a/data/maps/SilphCo_10F/header.inc b/data/maps/SilphCo_10F/header.inc index b211cc14d..32d229ed3 100644 --- a/data/maps/SilphCo_10F/header.inc +++ b/data/maps/SilphCo_10F/header.inc @@ -1,7 +1,7 @@ SilphCo_10F:: @ 834F834 .4byte SilphCo_10F_Layout @ 0x830A0E8 - .4byte gMapEvents_SilphCo_10F @ 0x83B0A20 - .4byte gMapScripts_SilphCo_10F @ 0x8161D86 + .4byte SilphCo_10F_MapEvents @ 0x83B0A20 + .4byte SilphCo_10F_MapScripts @ 0x8161D86 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 141 diff --git a/data/maps/SilphCo_11F/header.inc b/data/maps/SilphCo_11F/header.inc index 6121495c4..d451aa3bf 100644 --- a/data/maps/SilphCo_11F/header.inc +++ b/data/maps/SilphCo_11F/header.inc @@ -1,7 +1,7 @@ SilphCo_11F:: @ 834F850 .4byte SilphCo_11F_Layout @ 0x830A3B4 - .4byte gMapEvents_SilphCo_11F @ 0x83B0B44 - .4byte gMapScripts_SilphCo_11F @ 0x8161DEE + .4byte SilphCo_11F_MapEvents @ 0x83B0B44 + .4byte SilphCo_11F_MapScripts @ 0x8161DEE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 142 diff --git a/data/maps/SilphCo_1F/header.inc b/data/maps/SilphCo_1F/header.inc index df174f19c..e1dca1251 100644 --- a/data/maps/SilphCo_1F/header.inc +++ b/data/maps/SilphCo_1F/header.inc @@ -1,7 +1,7 @@ SilphCo_1F:: @ 834F738 .4byte SilphCo_1F_Layout @ 0x83071EC - .4byte gMapEvents_SilphCo_1F @ 0x83AFCE0 - .4byte gMapScripts_SilphCo_1F @ 0x8161625 + .4byte SilphCo_1F_MapEvents @ 0x83AFCE0 + .4byte SilphCo_1F_MapScripts @ 0x8161625 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 132 diff --git a/data/maps/SilphCo_2F/header.inc b/data/maps/SilphCo_2F/header.inc index 870637ea8..17274ac84 100644 --- a/data/maps/SilphCo_2F/header.inc +++ b/data/maps/SilphCo_2F/header.inc @@ -1,7 +1,7 @@ SilphCo_2F:: @ 834F754 .4byte SilphCo_2F_Layout @ 0x8307840 - .4byte gMapEvents_SilphCo_2F @ 0x83AFE1C - .4byte gMapScripts_SilphCo_2F @ 0x8161641 + .4byte SilphCo_2F_MapEvents @ 0x83AFE1C + .4byte SilphCo_2F_MapScripts @ 0x8161641 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 133 diff --git a/data/maps/SilphCo_3F/header.inc b/data/maps/SilphCo_3F/header.inc index 6117e9567..823d84c46 100644 --- a/data/maps/SilphCo_3F/header.inc +++ b/data/maps/SilphCo_3F/header.inc @@ -1,7 +1,7 @@ SilphCo_3F:: @ 834F770 .4byte SilphCo_3F_Layout @ 0x8307E94 - .4byte gMapEvents_SilphCo_3F @ 0x83AFF58 - .4byte gMapScripts_SilphCo_3F @ 0x81616C5 + .4byte SilphCo_3F_MapEvents @ 0x83AFF58 + .4byte SilphCo_3F_MapScripts @ 0x81616C5 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 134 diff --git a/data/maps/SilphCo_4F/header.inc b/data/maps/SilphCo_4F/header.inc index bbbc5688e..a59872690 100644 --- a/data/maps/SilphCo_4F/header.inc +++ b/data/maps/SilphCo_4F/header.inc @@ -1,7 +1,7 @@ SilphCo_4F:: @ 834F78C .4byte SilphCo_4F_Layout @ 0x83084E8 - .4byte gMapEvents_SilphCo_4F @ 0x83B00DC - .4byte gMapScripts_SilphCo_4F @ 0x8161736 + .4byte SilphCo_4F_MapEvents @ 0x83B00DC + .4byte SilphCo_4F_MapScripts @ 0x8161736 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 135 diff --git a/data/maps/SilphCo_5F/header.inc b/data/maps/SilphCo_5F/header.inc index 803d7b377..2c0d61a47 100644 --- a/data/maps/SilphCo_5F/header.inc +++ b/data/maps/SilphCo_5F/header.inc @@ -1,7 +1,7 @@ SilphCo_5F:: @ 834F7A8 .4byte SilphCo_5F_Layout @ 0x8308B3C - .4byte gMapEvents_SilphCo_5F @ 0x83B02D8 - .4byte gMapScripts_SilphCo_5F @ 0x81617BE + .4byte SilphCo_5F_MapEvents @ 0x83B02D8 + .4byte SilphCo_5F_MapScripts @ 0x81617BE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 136 diff --git a/data/maps/SilphCo_6F/header.inc b/data/maps/SilphCo_6F/header.inc index 0098e49e4..d9c522f9c 100644 --- a/data/maps/SilphCo_6F/header.inc +++ b/data/maps/SilphCo_6F/header.inc @@ -1,7 +1,7 @@ SilphCo_6F:: @ 834F7C4 .4byte SilphCo_6F_Layout @ 0x8308FFC - .4byte gMapEvents_SilphCo_6F @ 0x83B044C - .4byte gMapScripts_SilphCo_6F @ 0x8161881 + .4byte SilphCo_6F_MapEvents @ 0x83B044C + .4byte SilphCo_6F_MapScripts @ 0x8161881 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 137 diff --git a/data/maps/SilphCo_7F/header.inc b/data/maps/SilphCo_7F/header.inc index 9c4b5225b..8208b4ad1 100644 --- a/data/maps/SilphCo_7F/header.inc +++ b/data/maps/SilphCo_7F/header.inc @@ -1,7 +1,7 @@ SilphCo_7F:: @ 834F7E0 .4byte SilphCo_7F_Layout @ 0x83094BC - .4byte gMapEvents_SilphCo_7F @ 0x83B0660 - .4byte gMapScripts_SilphCo_7F @ 0x8161984 + .4byte SilphCo_7F_MapEvents @ 0x83B0660 + .4byte SilphCo_7F_MapScripts @ 0x8161984 .4byte NULL .2byte BGM_FRLG_SILPH .2byte 138 diff --git a/data/maps/SilphCo_8F/header.inc b/data/maps/SilphCo_8F/header.inc index 8a46b7924..5614c0a35 100644 --- a/data/maps/SilphCo_8F/header.inc +++ b/data/maps/SilphCo_8F/header.inc @@ -1,7 +1,7 @@ SilphCo_8F:: @ 834F7FC .4byte SilphCo_8F_Layout @ 0x830997C - .4byte gMapEvents_SilphCo_8F @ 0x83B0784 - .4byte gMapScripts_SilphCo_8F @ 0x8161C5F + .4byte SilphCo_8F_MapEvents @ 0x83B0784 + .4byte SilphCo_8F_MapScripts @ 0x8161C5F .4byte NULL .2byte BGM_FRLG_SILPH .2byte 139 diff --git a/data/maps/SilphCo_9F/header.inc b/data/maps/SilphCo_9F/header.inc index d5805078a..a89767234 100644 --- a/data/maps/SilphCo_9F/header.inc +++ b/data/maps/SilphCo_9F/header.inc @@ -1,7 +1,7 @@ SilphCo_9F:: @ 834F818 .4byte SilphCo_9F_Layout @ 0x8309E3C - .4byte gMapEvents_SilphCo_9F @ 0x83B0904 - .4byte gMapScripts_SilphCo_9F @ 0x8161CDE + .4byte SilphCo_9F_MapEvents @ 0x83B0904 + .4byte SilphCo_9F_MapScripts @ 0x8161CDE .4byte NULL .2byte BGM_FRLG_SILPH .2byte 140 diff --git a/data/maps/SilphCo_Elevator/header.inc b/data/maps/SilphCo_Elevator/header.inc index 9a107fb1d..abfebcfd4 100644 --- a/data/maps/SilphCo_Elevator/header.inc +++ b/data/maps/SilphCo_Elevator/header.inc @@ -1,7 +1,7 @@ SilphCo_Elevator:: @ 834F86C .4byte SilphCo_Elevator_Layout @ 0x8321330 - .4byte gMapEvents_SilphCo_Elevator @ 0x83B0B6C - .4byte gMapScripts_SilphCo_Elevator @ 0x8161F6E + .4byte SilphCo_Elevator_MapEvents @ 0x83B0B6C + .4byte SilphCo_Elevator_MapScripts @ 0x8161F6E .4byte NULL .2byte BGM_FRLG_SILPH .2byte 229 diff --git a/data/maps/SixIsland/header.inc b/data/maps/SixIsland/header.inc index 561cad4ce..3c6a68277 100644 --- a/data/maps/SixIsland/header.inc +++ b/data/maps/SixIsland/header.inc @@ -1,7 +1,7 @@ SixIsland:: @ 8350810 .4byte SixIsland_Layout @ 0x832430C - .4byte gMapEvents_SixIsland @ 0x83B65F8 - .4byte gMapScripts_SixIsland @ 0x8167ED8 + .4byte SixIsland_MapEvents @ 0x83B65F8 + .4byte SixIsland_MapScripts @ 0x8167ED8 .4byte SixIsland_MapConnections @ 0x83529D4 .2byte BGM_FRLG_ISLAND_SIX .2byte 236 diff --git a/data/maps/SixIsland_DottedHole_B1F/header.inc b/data/maps/SixIsland_DottedHole_B1F/header.inc index 5bcf69805..e6781f0e2 100644 --- a/data/maps/SixIsland_DottedHole_B1F/header.inc +++ b/data/maps/SixIsland_DottedHole_B1F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B1F:: @ 834FEC4 .4byte SixIsland_DottedHole_B1F_Layout @ 0x8343808 - .4byte gMapEvents_SixIsland_DottedHole_B1F @ 0x83B3898 - .4byte gMapScripts_SixIsland_DottedHole_B1F @ 0x81641B0 + .4byte SixIsland_DottedHole_B1F_MapEvents @ 0x83B3898 + .4byte SixIsland_DottedHole_B1F_MapScripts @ 0x81641B0 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 310 diff --git a/data/maps/SixIsland_DottedHole_B2F/header.inc b/data/maps/SixIsland_DottedHole_B2F/header.inc index f5d6a6b1e..5b02b306b 100644 --- a/data/maps/SixIsland_DottedHole_B2F/header.inc +++ b/data/maps/SixIsland_DottedHole_B2F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B2F:: @ 834FEE0 .4byte SixIsland_DottedHole_B2F_Layout @ 0x834394C - .4byte gMapEvents_SixIsland_DottedHole_B2F @ 0x83B38E0 - .4byte gMapScripts_SixIsland_DottedHole_B2F @ 0x81641B1 + .4byte SixIsland_DottedHole_B2F_MapEvents @ 0x83B38E0 + .4byte SixIsland_DottedHole_B2F_MapScripts @ 0x81641B1 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 311 diff --git a/data/maps/SixIsland_DottedHole_B3F/header.inc b/data/maps/SixIsland_DottedHole_B3F/header.inc index e30ffe292..0484d6fb4 100644 --- a/data/maps/SixIsland_DottedHole_B3F/header.inc +++ b/data/maps/SixIsland_DottedHole_B3F/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_B3F:: @ 834FEFC .4byte SixIsland_DottedHole_B3F_Layout @ 0x8343A90 - .4byte gMapEvents_SixIsland_DottedHole_B3F @ 0x83B3928 - .4byte gMapScripts_SixIsland_DottedHole_B3F @ 0x81641B2 + .4byte SixIsland_DottedHole_B3F_MapEvents @ 0x83B3928 + .4byte SixIsland_DottedHole_B3F_MapScripts @ 0x81641B2 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 312 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc index 8752ac442..cb34017a5 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/header.inc @@ -1,7 +1,7 @@ SixIsland_DottedHole_SapphireRoom:: @ 834FF34 .4byte SixIsland_DottedHole_SapphireRoom_Layout @ 0x8343DD8 - .4byte gMapEvents_SixIsland_DottedHole_SapphireRoom @ 0x83B39D0 - .4byte gMapScripts_SixIsland_DottedHole_SapphireRoom @ 0x81641B4 + .4byte SixIsland_DottedHole_SapphireRoom_MapEvents @ 0x83B39D0 + .4byte SixIsland_DottedHole_SapphireRoom_MapScripts @ 0x81641B4 .4byte NULL .2byte BGM_FRLG_TANOBY_RUINS .2byte 314 diff --git a/data/maps/SixIsland_GreenPath/header.inc b/data/maps/SixIsland_GreenPath/header.inc index 091dd662a..7e378de71 100644 --- a/data/maps/SixIsland_GreenPath/header.inc +++ b/data/maps/SixIsland_GreenPath/header.inc @@ -1,7 +1,7 @@ SixIsland_GreenPath:: @ 8350C8C .4byte SixIsland_GreenPath_Layout @ 0x832E0D0 - .4byte gMapEvents_SixIsland_GreenPath @ 0x83B8FA8 - .4byte gMapScripts_SixIsland_GreenPath @ 0x8168B2D + .4byte SixIsland_GreenPath_MapEvents @ 0x83B8FA8 + .4byte SixIsland_GreenPath_MapScripts @ 0x8168B2D .4byte SixIsland_GreenPath_MapConnections @ 0x8352E3C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 251 diff --git a/data/maps/SixIsland_Harbor/header.inc b/data/maps/SixIsland_Harbor/header.inc index cd468e7ce..edbb428b0 100644 --- a/data/maps/SixIsland_Harbor/header.inc +++ b/data/maps/SixIsland_Harbor/header.inc @@ -1,7 +1,7 @@ SixIsland_Harbor:: @ 8351F08 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_SixIsland_Harbor @ 0x83BF178 - .4byte gMapScripts_SixIsland_Harbor @ 0x8171E47 + .4byte SixIsland_Harbor_MapEvents @ 0x83BF178 + .4byte SixIsland_Harbor_MapScripts @ 0x8171E47 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 315 diff --git a/data/maps/SixIsland_House/header.inc b/data/maps/SixIsland_House/header.inc index 80be57344..a98057971 100644 --- a/data/maps/SixIsland_House/header.inc +++ b/data/maps/SixIsland_House/header.inc @@ -1,7 +1,7 @@ SixIsland_House:: @ 8351F24 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SixIsland_House @ 0x83BF1AC - .4byte gMapScripts_SixIsland_House @ 0x8171E5B + .4byte SixIsland_House_MapEvents @ 0x83BF1AC + .4byte SixIsland_House_MapScripts @ 0x8171E5B .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 11 diff --git a/data/maps/SixIsland_Mart/header.inc b/data/maps/SixIsland_Mart/header.inc index ff490a115..d7483ec18 100644 --- a/data/maps/SixIsland_Mart/header.inc +++ b/data/maps/SixIsland_Mart/header.inc @@ -1,7 +1,7 @@ SixIsland_Mart:: @ 8351F40 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_SixIsland_Mart @ 0x83BF210 - .4byte gMapScripts_SixIsland_Mart @ 0x8171E65 + .4byte SixIsland_Mart_MapEvents @ 0x83BF210 + .4byte SixIsland_Mart_MapScripts @ 0x8171E65 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/SixIsland_OutcastIsland/header.inc b/data/maps/SixIsland_OutcastIsland/header.inc index 70ba73f2b..e6cc6186d 100644 --- a/data/maps/SixIsland_OutcastIsland/header.inc +++ b/data/maps/SixIsland_OutcastIsland/header.inc @@ -1,7 +1,7 @@ SixIsland_OutcastIsland:: @ 8350C70 .4byte SixIsland_OutcastIsland_Layout @ 0x832D56C - .4byte gMapEvents_SixIsland_OutcastIsland @ 0x83B8F38 - .4byte gMapScripts_SixIsland_OutcastIsland @ 0x8168B15 + .4byte SixIsland_OutcastIsland_MapEvents @ 0x83B8F38 + .4byte SixIsland_OutcastIsland_MapScripts @ 0x8168B15 .4byte SixIsland_OutcastIsland_MapConnections @ 0x8352E1C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 250 diff --git a/data/maps/SixIsland_PokemonCenter_1F/header.inc b/data/maps/SixIsland_PokemonCenter_1F/header.inc index c26a336c6..e2d7f3aa9 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/header.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ SixIsland_PokemonCenter_1F:: @ 8351ED0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_SixIsland_PokemonCenter_1F @ 0x83BF0A0 - .4byte gMapScripts_SixIsland_PokemonCenter_1F @ 0x8171D6A + .4byte SixIsland_PokemonCenter_1F_MapEvents @ 0x83BF0A0 + .4byte SixIsland_PokemonCenter_1F_MapScripts @ 0x8171D6A .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/SixIsland_PokemonCenter_2F/header.inc b/data/maps/SixIsland_PokemonCenter_2F/header.inc index 16784fe32..f11114273 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/header.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ SixIsland_PokemonCenter_2F:: @ 8351EEC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_SixIsland_PokemonCenter_2F @ 0x83BF12C - .4byte gMapScripts_SixIsland_PokemonCenter_2F @ 0x8171E20 + .4byte SixIsland_PokemonCenter_2F_MapEvents @ 0x83BF12C + .4byte SixIsland_PokemonCenter_2F_MapScripts @ 0x8171E20 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/SixIsland_RuinValley/header.inc b/data/maps/SixIsland_RuinValley/header.inc index bd8cd251b..31ec9bc84 100644 --- a/data/maps/SixIsland_RuinValley/header.inc +++ b/data/maps/SixIsland_RuinValley/header.inc @@ -1,7 +1,7 @@ SixIsland_RuinValley:: @ 8350CC4 .4byte SixIsland_RuinValley_Layout @ 0x83302D8 - .4byte gMapEvents_SixIsland_RuinValley @ 0x83B92A0 - .4byte gMapScripts_SixIsland_RuinValley @ 0x8168B53 + .4byte SixIsland_RuinValley_MapEvents @ 0x83B92A0 + .4byte SixIsland_RuinValley_MapScripts @ 0x8168B53 .4byte SixIsland_RuinValley_MapConnections @ 0x8352E7C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 253 diff --git a/data/maps/SixIsland_WaterPath/header.inc b/data/maps/SixIsland_WaterPath/header.inc index f226d3856..4538a40a2 100644 --- a/data/maps/SixIsland_WaterPath/header.inc +++ b/data/maps/SixIsland_WaterPath/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath:: @ 8350CA8 .4byte SixIsland_WaterPath_Layout @ 0x832F3B4 - .4byte gMapEvents_SixIsland_WaterPath @ 0x83B90E0 - .4byte gMapScripts_SixIsland_WaterPath @ 0x8168B40 + .4byte SixIsland_WaterPath_MapEvents @ 0x83B90E0 + .4byte SixIsland_WaterPath_MapScripts @ 0x8168B40 .4byte SixIsland_WaterPath_MapConnections @ 0x8352E68 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 252 diff --git a/data/maps/SixIsland_WaterPath_House1/header.inc b/data/maps/SixIsland_WaterPath_House1/header.inc index 45482e174..dbd7e3ece 100644 --- a/data/maps/SixIsland_WaterPath_House1/header.inc +++ b/data/maps/SixIsland_WaterPath_House1/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_House1:: @ 8351FB0 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_SixIsland_WaterPath_House1 @ 0x83BF334 - .4byte gMapScripts_SixIsland_WaterPath_House1 @ 0x817206C + .4byte SixIsland_WaterPath_House1_MapEvents @ 0x83BF334 + .4byte SixIsland_WaterPath_House1_MapScripts @ 0x817206C .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 13 diff --git a/data/maps/SixIsland_WaterPath_House2/header.inc b/data/maps/SixIsland_WaterPath_House2/header.inc index 47c53fc7d..e0d5408a6 100644 --- a/data/maps/SixIsland_WaterPath_House2/header.inc +++ b/data/maps/SixIsland_WaterPath_House2/header.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_House2:: @ 8351FCC .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_SixIsland_WaterPath_House2 @ 0x83BF368 - .4byte gMapScripts_SixIsland_WaterPath_House2 @ 0x8172178 + .4byte SixIsland_WaterPath_House2_MapEvents @ 0x83BF368 + .4byte SixIsland_WaterPath_House2_MapScripts @ 0x8172178 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 11 diff --git a/data/maps/ThreeIsland/header.inc b/data/maps/ThreeIsland/header.inc index a73e32050..e49570fa4 100644 --- a/data/maps/ThreeIsland/header.inc +++ b/data/maps/ThreeIsland/header.inc @@ -1,7 +1,7 @@ ThreeIsland:: @ 83507A0 .4byte ThreeIsland_Layout @ 0x832265C - .4byte gMapEvents_ThreeIsland @ 0x83B62C8 - .4byte gMapScripts_ThreeIsland @ 0x81677AD + .4byte ThreeIsland_MapEvents @ 0x83B62C8 + .4byte ThreeIsland_MapScripts @ 0x81677AD .4byte ThreeIsland_MapConnections @ 0x8352980 .2byte BGM_FRLG_ISLAND_ONE .2byte 232 diff --git a/data/maps/ThreeIsland_BerryForest/header.inc b/data/maps/ThreeIsland_BerryForest/header.inc index 3a848ee68..928ba8d4a 100644 --- a/data/maps/ThreeIsland_BerryForest/header.inc +++ b/data/maps/ThreeIsland_BerryForest/header.inc @@ -1,7 +1,7 @@ ThreeIsland_BerryForest:: @ 834FE00 .4byte ThreeIsland_BerryForest_Layout @ 0x833A7A8 - .4byte gMapEvents_ThreeIsland_BerryForest @ 0x83B340C - .4byte gMapScripts_ThreeIsland_BerryForest @ 0x8163C71 + .4byte ThreeIsland_BerryForest_MapEvents @ 0x83B340C + .4byte ThreeIsland_BerryForest_MapScripts @ 0x8163C71 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 270 diff --git a/data/maps/ThreeIsland_BondBridge/header.inc b/data/maps/ThreeIsland_BondBridge/header.inc index d7305b2bc..43c5f0c30 100644 --- a/data/maps/ThreeIsland_BondBridge/header.inc +++ b/data/maps/ThreeIsland_BondBridge/header.inc @@ -1,7 +1,7 @@ ThreeIsland_BondBridge:: @ 8350B58 .4byte ThreeIsland_BondBridge_Layout @ 0x8327BDC - .4byte gMapEvents_ThreeIsland_BondBridge @ 0x83B8A9C - .4byte gMapScripts_ThreeIsland_BondBridge @ 0x8168776 + .4byte ThreeIsland_BondBridge_MapEvents @ 0x83B8A9C + .4byte ThreeIsland_BondBridge_MapScripts @ 0x8168776 .4byte ThreeIsland_BondBridge_MapConnections @ 0x8352D64 .2byte BGM_FRLG_ROUTE_3 .2byte 240 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/header.inc b/data/maps/ThreeIsland_DunsparceTunnel/header.inc index 5e3c51372..4f870e33d 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/header.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/header.inc @@ -1,7 +1,7 @@ ThreeIsland_DunsparceTunnel:: @ 8350340 .4byte ThreeIsland_DunsparceTunnel_Layout @ 0x83451F8 - .4byte gMapEvents_ThreeIsland_DunsparceTunnel @ 0x83B4788 - .4byte gMapScripts_ThreeIsland_DunsparceTunnel @ 0x8164D26 + .4byte ThreeIsland_DunsparceTunnel_MapEvents @ 0x83B4788 + .4byte ThreeIsland_DunsparceTunnel_MapScripts @ 0x8164D26 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 318 diff --git a/data/maps/ThreeIsland_Harbor/header.inc b/data/maps/ThreeIsland_Harbor/header.inc index 3a29f5fd0..296d4889a 100644 --- a/data/maps/ThreeIsland_Harbor/header.inc +++ b/data/maps/ThreeIsland_Harbor/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Harbor:: @ 8351F5C .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_ThreeIsland_Harbor @ 0x83BF25C - .4byte gMapScripts_ThreeIsland_Harbor @ 0x8171EA9 + .4byte ThreeIsland_Harbor_MapEvents @ 0x83BF25C + .4byte ThreeIsland_Harbor_MapScripts @ 0x8171EA9 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/ThreeIsland_House1/header.inc b/data/maps/ThreeIsland_House1/header.inc index 7886ef8c6..1be2f87cf 100644 --- a/data/maps/ThreeIsland_House1/header.inc +++ b/data/maps/ThreeIsland_House1/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House1:: @ 8351C84 .4byte ThreeIsland_House1_Layout @ 0x82D7504 - .4byte gMapEvents_ThreeIsland_House1 @ 0x83BE7A4 - .4byte gMapScripts_ThreeIsland_House1 @ 0x8171819 + .4byte ThreeIsland_House1_MapEvents @ 0x83BE7A4 + .4byte ThreeIsland_House1_MapScripts @ 0x8171819 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 31 diff --git a/data/maps/ThreeIsland_House2/header.inc b/data/maps/ThreeIsland_House2/header.inc index 25c26564e..e0f113fff 100644 --- a/data/maps/ThreeIsland_House2/header.inc +++ b/data/maps/ThreeIsland_House2/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House2:: @ 8351CF4 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House2 @ 0x83BE97C - .4byte gMapScripts_ThreeIsland_House2 @ 0x81718DF + .4byte ThreeIsland_House2_MapEvents @ 0x83BE97C + .4byte ThreeIsland_House2_MapScripts @ 0x81718DF .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House3/header.inc b/data/maps/ThreeIsland_House3/header.inc index 68f69ae93..63799a6dc 100644 --- a/data/maps/ThreeIsland_House3/header.inc +++ b/data/maps/ThreeIsland_House3/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House3:: @ 8351D10 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House3 @ 0x83BE9B0 - .4byte gMapScripts_ThreeIsland_House3 @ 0x8171902 + .4byte ThreeIsland_House3_MapEvents @ 0x83BE9B0 + .4byte ThreeIsland_House3_MapScripts @ 0x8171902 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House4/header.inc b/data/maps/ThreeIsland_House4/header.inc index d410743d1..9a270c499 100644 --- a/data/maps/ThreeIsland_House4/header.inc +++ b/data/maps/ThreeIsland_House4/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House4:: @ 8351D2C .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House4 @ 0x83BE9FC - .4byte gMapScripts_ThreeIsland_House4 @ 0x817190C + .4byte ThreeIsland_House4_MapEvents @ 0x83BE9FC + .4byte ThreeIsland_House4_MapScripts @ 0x817190C .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_House5/header.inc b/data/maps/ThreeIsland_House5/header.inc index 7383dee7b..0579cbe99 100644 --- a/data/maps/ThreeIsland_House5/header.inc +++ b/data/maps/ThreeIsland_House5/header.inc @@ -1,7 +1,7 @@ ThreeIsland_House5:: @ 8351D48 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_ThreeIsland_House5 @ 0x83BEA30 - .4byte gMapScripts_ThreeIsland_House5 @ 0x817191F + .4byte ThreeIsland_House5_MapEvents @ 0x83BEA30 + .4byte ThreeIsland_House5_MapScripts @ 0x817191F .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/ThreeIsland_Mart/header.inc b/data/maps/ThreeIsland_Mart/header.inc index c3ed2bdf8..1bf63765e 100644 --- a/data/maps/ThreeIsland_Mart/header.inc +++ b/data/maps/ThreeIsland_Mart/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Mart:: @ 8351CD8 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_ThreeIsland_Mart @ 0x83BE930 - .4byte gMapScripts_ThreeIsland_Mart @ 0x817188C + .4byte ThreeIsland_Mart_MapEvents @ 0x83BE930 + .4byte ThreeIsland_Mart_MapScripts @ 0x817188C .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc index 25fa4275c..d65a7ef6a 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/header.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ ThreeIsland_PokemonCenter_1F:: @ 8351CA0 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_ThreeIsland_PokemonCenter_1F @ 0x83BE828 - .4byte gMapScripts_ThreeIsland_PokemonCenter_1F @ 0x8171832 + .4byte ThreeIsland_PokemonCenter_1F_MapEvents @ 0x83BE828 + .4byte ThreeIsland_PokemonCenter_1F_MapScripts @ 0x8171832 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc index 40eedca05..83ab3678c 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/header.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ ThreeIsland_PokemonCenter_2F:: @ 8351CBC .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_ThreeIsland_PokemonCenter_2F @ 0x83BE8B4 - .4byte gMapScripts_ThreeIsland_PokemonCenter_2F @ 0x8171865 + .4byte ThreeIsland_PokemonCenter_2F_MapEvents @ 0x83BE8B4 + .4byte ThreeIsland_PokemonCenter_2F_MapScripts @ 0x8171865 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/ThreeIsland_Port/header.inc b/data/maps/ThreeIsland_Port/header.inc index 6d7c48e29..7fac5fe54 100644 --- a/data/maps/ThreeIsland_Port/header.inc +++ b/data/maps/ThreeIsland_Port/header.inc @@ -1,7 +1,7 @@ ThreeIsland_Port:: @ 8350B74 .4byte ThreeIsland_Port_Layout @ 0x8328380 - .4byte gMapEvents_ThreeIsland_Port @ 0x83B8B10 - .4byte gMapScripts_ThreeIsland_Port @ 0x8168789 + .4byte ThreeIsland_Port_MapEvents @ 0x83B8B10 + .4byte ThreeIsland_Port_MapScripts @ 0x8168789 .4byte ThreeIsland_Port_MapConnections @ 0x8352D78 .2byte BGM_FRLG_ROUTE_3 .2byte 241 diff --git a/data/maps/TwoIsland/header.inc b/data/maps/TwoIsland/header.inc index 813ef23bd..698e7544b 100644 --- a/data/maps/TwoIsland/header.inc +++ b/data/maps/TwoIsland/header.inc @@ -1,7 +1,7 @@ TwoIsland:: @ 8350784 .4byte TwoIsland_Layout @ 0x8321EB8 - .4byte gMapEvents_TwoIsland @ 0x83B6074 - .4byte gMapScripts_TwoIsland @ 0x8167564 + .4byte TwoIsland_MapEvents @ 0x83B6074 + .4byte TwoIsland_MapScripts @ 0x8167564 .4byte TwoIsland_MapConnections @ 0x8352960 .2byte BGM_FRLG_ISLAND_ONE .2byte 231 diff --git a/data/maps/TwoIsland_CapeBrink/header.inc b/data/maps/TwoIsland_CapeBrink/header.inc index 0e8ec9654..d97cc38a1 100644 --- a/data/maps/TwoIsland_CapeBrink/header.inc +++ b/data/maps/TwoIsland_CapeBrink/header.inc @@ -1,7 +1,7 @@ TwoIsland_CapeBrink:: @ 8350B3C .4byte TwoIsland_CapeBrink_Layout @ 0x8326CB8 - .4byte gMapEvents_TwoIsland_CapeBrink @ 0x83B8964 - .4byte gMapScripts_TwoIsland_CapeBrink @ 0x8168775 + .4byte TwoIsland_CapeBrink_MapEvents @ 0x83B8964 + .4byte TwoIsland_CapeBrink_MapScripts @ 0x8168775 .4byte TwoIsland_CapeBrink_MapConnections @ 0x8352D50 .2byte BGM_FRLG_ROUTE_3 .2byte 239 diff --git a/data/maps/TwoIsland_CapeBrink_House/header.inc b/data/maps/TwoIsland_CapeBrink_House/header.inc index 37cc779c7..a5cb71beb 100644 --- a/data/maps/TwoIsland_CapeBrink_House/header.inc +++ b/data/maps/TwoIsland_CapeBrink_House/header.inc @@ -1,7 +1,7 @@ TwoIsland_CapeBrink_House:: @ 8351F94 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_TwoIsland_CapeBrink_House @ 0x83BF2F4 - .4byte gMapScripts_TwoIsland_CapeBrink_House @ 0x817206B + .4byte TwoIsland_CapeBrink_House_MapEvents @ 0x83BF2F4 + .4byte TwoIsland_CapeBrink_House_MapScripts @ 0x817206B .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/TwoIsland_Harbor/header.inc b/data/maps/TwoIsland_Harbor/header.inc index 9aa296c48..a7f4b3c97 100644 --- a/data/maps/TwoIsland_Harbor/header.inc +++ b/data/maps/TwoIsland_Harbor/header.inc @@ -1,7 +1,7 @@ TwoIsland_Harbor:: @ 8351C68 .4byte Island_Harbor_Layout @ 0x8343FB8 - .4byte gMapEvents_TwoIsland_Harbor @ 0x83BE764 - .4byte gMapScripts_TwoIsland_Harbor @ 0x8171805 + .4byte TwoIsland_Harbor_MapEvents @ 0x83BE764 + .4byte TwoIsland_Harbor_MapScripts @ 0x8171805 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 315 diff --git a/data/maps/TwoIsland_House/header.inc b/data/maps/TwoIsland_House/header.inc index 6d0ea5f87..ef308156d 100644 --- a/data/maps/TwoIsland_House/header.inc +++ b/data/maps/TwoIsland_House/header.inc @@ -1,7 +1,7 @@ TwoIsland_House:: @ 8351C14 .4byte House3_Layout @ 0x82D5CB8 - .4byte gMapEvents_TwoIsland_House @ 0x83BE620 - .4byte gMapScripts_TwoIsland_House @ 0x8171618 + .4byte TwoIsland_House_MapEvents @ 0x83BE620 + .4byte TwoIsland_House_MapScripts @ 0x8171618 .4byte NULL .2byte BGM_FRLG_ISLAND_ONE .2byte 11 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/header.inc b/data/maps/TwoIsland_JoyfulGameCorner/header.inc index 5469caa39..35934a5f6 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/header.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/header.inc @@ -1,7 +1,7 @@ TwoIsland_JoyfulGameCorner:: @ 8351BF8 .4byte TwoIsland_JoyfulGameCorner_Layout @ 0x833AA84 - .4byte gMapEvents_TwoIsland_JoyfulGameCorner @ 0x83BE5EC - .4byte gMapScripts_TwoIsland_JoyfulGameCorner @ 0x81713D0 + .4byte TwoIsland_JoyfulGameCorner_MapEvents @ 0x83BE5EC + .4byte TwoIsland_JoyfulGameCorner_MapScripts @ 0x81713D0 .4byte NULL .2byte BGM_FRLG_GAMECORNER .2byte 272 diff --git a/data/maps/TwoIsland_PokemonCenter_1F/header.inc b/data/maps/TwoIsland_PokemonCenter_1F/header.inc index 294f0ea5b..8999f1fae 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/header.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ TwoIsland_PokemonCenter_1F:: @ 8351C30 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_TwoIsland_PokemonCenter_1F @ 0x83BE68C - .4byte gMapScripts_TwoIsland_PokemonCenter_1F @ 0x81717B4 + .4byte TwoIsland_PokemonCenter_1F_MapEvents @ 0x83BE68C + .4byte TwoIsland_PokemonCenter_1F_MapScripts @ 0x81717B4 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/TwoIsland_PokemonCenter_2F/header.inc b/data/maps/TwoIsland_PokemonCenter_2F/header.inc index 27c60df4b..4c690b5ac 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/header.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ TwoIsland_PokemonCenter_2F:: @ 8351C4C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_TwoIsland_PokemonCenter_2F @ 0x83BE718 - .4byte gMapScripts_TwoIsland_PokemonCenter_2F @ 0x81717DE + .4byte TwoIsland_PokemonCenter_2F_MapEvents @ 0x83BE718 + .4byte TwoIsland_PokemonCenter_2F_MapScripts @ 0x81717DE .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/UndergroundPath_EastEntrance/header.inc b/data/maps/UndergroundPath_EastEntrance/header.inc index 6a2c0105d..298cbfe9d 100644 --- a/data/maps/UndergroundPath_EastEntrance/header.inc +++ b/data/maps/UndergroundPath_EastEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_EastEntrance:: @ 834F5E8 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_EastEntrance @ 0x83AF430 - .4byte gMapScripts_UndergroundPath_EastEntrance @ 0x8160EDD + .4byte UndergroundPath_EastEntrance_MapEvents @ 0x83AF430 + .4byte UndergroundPath_EastEntrance_MapScripts @ 0x8160EDD .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_EastWestTunnel/header.inc b/data/maps/UndergroundPath_EastWestTunnel/header.inc index 2dc7454b8..bd5afdf6d 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/header.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/header.inc @@ -1,7 +1,7 @@ UndergroundPath_EastWestTunnel:: @ 834F5CC .4byte UndergroundPath_EastWestTunnel_Layout @ 0x8319898 - .4byte gMapEvents_UndergroundPath_EastWestTunnel @ 0x83AF3E4 - .4byte gMapScripts_UndergroundPath_EastWestTunnel @ 0x8160ED3 + .4byte UndergroundPath_EastWestTunnel_MapEvents @ 0x83AF3E4 + .4byte UndergroundPath_EastWestTunnel_MapScripts @ 0x8160ED3 .4byte NULL .2byte BGM_FRLG_ROUTE_1 .2byte 173 diff --git a/data/maps/UndergroundPath_NorthEntrance/header.inc b/data/maps/UndergroundPath_NorthEntrance/header.inc index 5b6b9b3b8..242d5ece9 100644 --- a/data/maps/UndergroundPath_NorthEntrance/header.inc +++ b/data/maps/UndergroundPath_NorthEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthEntrance:: @ 834F55C .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_NorthEntrance @ 0x83AF25C - .4byte gMapScripts_UndergroundPath_NorthEntrance @ 0x8160E38 + .4byte UndergroundPath_NorthEntrance_MapEvents @ 0x83AF25C + .4byte UndergroundPath_NorthEntrance_MapScripts @ 0x8160E38 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc index 02f7553ba..9ffc1d01b 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/header.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/header.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthSouthTunnel:: @ 834F578 .4byte UndergroundPath_NorthSouthTunnel_Layout @ 0x8319CAC - .4byte gMapEvents_UndergroundPath_NorthSouthTunnel @ 0x83AF2D4 - .4byte gMapScripts_UndergroundPath_NorthSouthTunnel @ 0x8160EB5 + .4byte UndergroundPath_NorthSouthTunnel_MapEvents @ 0x83AF2D4 + .4byte UndergroundPath_NorthSouthTunnel_MapScripts @ 0x8160EB5 .4byte NULL .2byte BGM_FRLG_ROUTE_1 .2byte 174 diff --git a/data/maps/UndergroundPath_SouthEntrance/header.inc b/data/maps/UndergroundPath_SouthEntrance/header.inc index 3811bc87d..4e0ef3d33 100644 --- a/data/maps/UndergroundPath_SouthEntrance/header.inc +++ b/data/maps/UndergroundPath_SouthEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_SouthEntrance:: @ 834F594 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_SouthEntrance @ 0x83AF320 - .4byte gMapScripts_UndergroundPath_SouthEntrance @ 0x8160EBF + .4byte UndergroundPath_SouthEntrance_MapEvents @ 0x83AF320 + .4byte UndergroundPath_SouthEntrance_MapScripts @ 0x8160EBF .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UndergroundPath_WestEntrance/header.inc b/data/maps/UndergroundPath_WestEntrance/header.inc index ed95def83..9ebfd9946 100644 --- a/data/maps/UndergroundPath_WestEntrance/header.inc +++ b/data/maps/UndergroundPath_WestEntrance/header.inc @@ -1,7 +1,7 @@ UndergroundPath_WestEntrance:: @ 834F5B0 .4byte UndergroundPath_Entrance_Layout @ 0x8319414 - .4byte gMapEvents_UndergroundPath_WestEntrance @ 0x83AF36C - .4byte gMapScripts_UndergroundPath_WestEntrance @ 0x8160EC9 + .4byte UndergroundPath_WestEntrance_MapEvents @ 0x83AF36C + .4byte UndergroundPath_WestEntrance_MapScripts @ 0x8160EC9 .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 172 diff --git a/data/maps/UnknownMap_00_00/header.inc b/data/maps/UnknownMap_00_00/header.inc index 1746127c8..a43fc1ec3 100644 --- a/data/maps/UnknownMap_00_00/header.inc +++ b/data/maps/UnknownMap_00_00/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_00:: @ 834F188 .4byte UnknownMap_00_00_Layout @ 0x82D89E8 - .4byte gMapEvents_UnknownMap_00_00 @ 0x83AE0DC - .4byte gMapScripts_UnknownMap_00_00 @ 0x8160478 + .4byte UnknownMap_00_00_MapEvents @ 0x83AE0DC + .4byte UnknownMap_00_00_MapScripts @ 0x8160478 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 47 diff --git a/data/maps/UnknownMap_00_01/header.inc b/data/maps/UnknownMap_00_01/header.inc index 8f6f03655..2e012f5d3 100644 --- a/data/maps/UnknownMap_00_01/header.inc +++ b/data/maps/UnknownMap_00_01/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_01:: @ 834F1A4 .4byte UnknownMap_00_01_Layout @ 0x82D8AE4 - .4byte gMapEvents_UnknownMap_00_01 @ 0x83AE138 - .4byte gMapScripts_UnknownMap_00_01 @ 0x8160479 + .4byte UnknownMap_00_01_MapEvents @ 0x83AE138 + .4byte UnknownMap_00_01_MapScripts @ 0x8160479 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 48 diff --git a/data/maps/UnknownMap_00_02/header.inc b/data/maps/UnknownMap_00_02/header.inc index 5616915ee..39a06131d 100644 --- a/data/maps/UnknownMap_00_02/header.inc +++ b/data/maps/UnknownMap_00_02/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_02:: @ 834F1C0 .4byte UnknownMap_00_02_Layout @ 0x82D8C98 - .4byte gMapEvents_UnknownMap_00_02 @ 0x83AE1C4 - .4byte gMapScripts_UnknownMap_00_02 @ 0x816047A + .4byte UnknownMap_00_02_MapEvents @ 0x83AE1C4 + .4byte UnknownMap_00_02_MapScripts @ 0x816047A .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 49 diff --git a/data/maps/UnknownMap_00_03/header.inc b/data/maps/UnknownMap_00_03/header.inc index 40833172f..df701c238 100644 --- a/data/maps/UnknownMap_00_03/header.inc +++ b/data/maps/UnknownMap_00_03/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_03:: @ 834F1DC .4byte UnknownMap_00_03_Layout @ 0x82D8DB8 - .4byte gMapEvents_UnknownMap_00_03 @ 0x83AE238 - .4byte gMapScripts_UnknownMap_00_03 @ 0x816047B + .4byte UnknownMap_00_03_MapEvents @ 0x83AE238 + .4byte UnknownMap_00_03_MapScripts @ 0x816047B .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 50 diff --git a/data/maps/UnknownMap_00_04/header.inc b/data/maps/UnknownMap_00_04/header.inc index 9e86235c6..585175a4d 100644 --- a/data/maps/UnknownMap_00_04/header.inc +++ b/data/maps/UnknownMap_00_04/header.inc @@ -1,7 +1,7 @@ UnknownMap_00_04:: @ 834F1F8 .4byte UnknownMap_00_04_Layout @ 0x83388C4 - .4byte gMapEvents_UnknownMap_00_04 @ 0x83AE32C - .4byte gMapScripts_UnknownMap_00_04 @ 0x816047C + .4byte UnknownMap_00_04_MapEvents @ 0x83AE32C + .4byte UnknownMap_00_04_MapScripts @ 0x816047C .4byte NULL .2byte BGM_FRLG_UNION_ROOM .2byte 262 diff --git a/data/maps/UnknownMap_03_50/header.inc b/data/maps/UnknownMap_03_50/header.inc index 8a6415bba..f58894d13 100644 --- a/data/maps/UnknownMap_03_50/header.inc +++ b/data/maps/UnknownMap_03_50/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_50:: @ 8350B90 .4byte UnknownMap_03_50_Layout @ 0x83283A8 - .4byte gMapEvents_UnknownMap_03_50 @ 0x83B8B24 - .4byte gMapScripts_UnknownMap_03_50 @ 0x81687E0 + .4byte UnknownMap_03_50_MapEvents @ 0x83B8B24 + .4byte UnknownMap_03_50_MapScripts @ 0x81687E0 .4byte UnknownMap_03_50_MapConnections @ 0x8352D8C .2byte BGM_FRLG_SEVII_ISLANDS .2byte 242 diff --git a/data/maps/UnknownMap_03_51/header.inc b/data/maps/UnknownMap_03_51/header.inc index 97cd42f9e..e7defa615 100644 --- a/data/maps/UnknownMap_03_51/header.inc +++ b/data/maps/UnknownMap_03_51/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_51:: @ 8350BAC .4byte UnknownMap_03_51_Layout @ 0x83283D0 - .4byte gMapEvents_UnknownMap_03_51 @ 0x83B8B38 - .4byte gMapScripts_UnknownMap_03_51 @ 0x81687E1 + .4byte UnknownMap_03_51_MapEvents @ 0x83B8B38 + .4byte UnknownMap_03_51_MapScripts @ 0x81687E1 .4byte UnknownMap_03_51_MapConnections @ 0x8352DA0 .2byte BGM_FRLG_SEVII_ISLANDS .2byte 243 diff --git a/data/maps/UnknownMap_03_52/header.inc b/data/maps/UnknownMap_03_52/header.inc index 2ab4b7e8b..097de23cb 100644 --- a/data/maps/UnknownMap_03_52/header.inc +++ b/data/maps/UnknownMap_03_52/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_52:: @ 8350BC8 .4byte UnknownMap_03_52_Layout @ 0x8329114 - .4byte gMapEvents_UnknownMap_03_52 @ 0x83B8B4C - .4byte gMapScripts_UnknownMap_03_52 @ 0x81687E2 + .4byte UnknownMap_03_52_MapEvents @ 0x83B8B4C + .4byte UnknownMap_03_52_MapScripts @ 0x81687E2 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 244 diff --git a/data/maps/UnknownMap_03_53/header.inc b/data/maps/UnknownMap_03_53/header.inc index 9ff13c2a4..22e8c0e98 100644 --- a/data/maps/UnknownMap_03_53/header.inc +++ b/data/maps/UnknownMap_03_53/header.inc @@ -1,7 +1,7 @@ UnknownMap_03_53:: @ 8350BE4 .4byte UnknownMap_03_53_Layout @ 0x8329C78 - .4byte gMapEvents_UnknownMap_03_53 @ 0x83B8B60 - .4byte gMapScripts_UnknownMap_03_53 @ 0x81687E3 + .4byte UnknownMap_03_53_MapEvents @ 0x83B8B60 + .4byte UnknownMap_03_53_MapScripts @ 0x81687E3 .4byte NULL .2byte BGM_FRLG_SEVII_ISLANDS .2byte 245 diff --git a/data/maps/UnknownMap_18_01/header.inc b/data/maps/UnknownMap_18_01/header.inc index 23c7c3a83..02fb72d6f 100644 --- a/data/maps/UnknownMap_18_01/header.inc +++ b/data/maps/UnknownMap_18_01/header.inc @@ -1,7 +1,7 @@ UnknownMap_18_01:: @ 835185C .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnknownMap_18_01 @ 0x83BD758 - .4byte gMapScripts_UnknownMap_18_01 @ 0x816FA8C + .4byte UnknownMap_18_01_MapEvents @ 0x83BD758 + .4byte UnknownMap_18_01_MapScripts @ 0x816FA8C .4byte NULL .2byte BGM_FRLG_ROUTE_3 .2byte 7 diff --git a/data/maps/UnusedHouse_27_00/header.inc b/data/maps/UnusedHouse_27_00/header.inc index f4032f2f3..27571a106 100644 --- a/data/maps/UnusedHouse_27_00/header.inc +++ b/data/maps/UnusedHouse_27_00/header.inc @@ -1,7 +1,7 @@ UnusedHouse_27_00:: @ 8351A38 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnusedHouse_27_00 @ 0x83BDF30 - .4byte gMapScripts_UnusedHouse_27_00 @ 0x81704FA + .4byte UnusedHouse_27_00_MapEvents @ 0x83BDF30 + .4byte UnusedHouse_27_00_MapScripts @ 0x81704FA .4byte NULL .2byte BGM_FRLG_ROUTE_3 .2byte 7 diff --git a/data/maps/UnusedHouse_29_00/header.inc b/data/maps/UnusedHouse_29_00/header.inc index 65f677125..79c745105 100644 --- a/data/maps/UnusedHouse_29_00/header.inc +++ b/data/maps/UnusedHouse_29_00/header.inc @@ -1,7 +1,7 @@ UnusedHouse_29_00:: @ 8351A70 .4byte House2_Layout @ 0x82D5840 - .4byte gMapEvents_UnusedHouse_29_00 @ 0x83BDFA0 - .4byte gMapScripts_UnusedHouse_29_00 @ 0x8170522 + .4byte UnusedHouse_29_00_MapEvents @ 0x83BDFA0 + .4byte UnusedHouse_29_00_MapScripts @ 0x8170522 .4byte NULL .2byte BGM_FRLG_INDIGO_PLATEAU .2byte 7 diff --git a/data/maps/UnusedHouse_31_05/header.inc b/data/maps/UnusedHouse_31_05/header.inc index 71d619417..ad4098e09 100644 --- a/data/maps/UnusedHouse_31_05/header.inc +++ b/data/maps/UnusedHouse_31_05/header.inc @@ -1,7 +1,7 @@ UnusedHouse_31_05:: @ 8351B34 .4byte House4_Layout @ 0x82D6070 - .4byte gMapEvents_UnusedHouse_31_05 @ 0x83BE254 - .4byte gMapScripts_UnusedHouse_31_05 @ 0x8170BE3 + .4byte UnusedHouse_31_05_MapEvents @ 0x83BE254 + .4byte UnusedHouse_31_05_MapScripts @ 0x8170BE3 .4byte NULL .2byte BGM_FRLG_ISLAND_SIX .2byte 13 diff --git a/data/maps/VermilionCity/header.inc b/data/maps/VermilionCity/header.inc index a2ce4787e..efc42750d 100644 --- a/data/maps/VermilionCity/header.inc +++ b/data/maps/VermilionCity/header.inc @@ -1,7 +1,7 @@ VermilionCity:: @ 83506A4 .4byte VermilionCity_Layout @ 0x82E1534 - .4byte gMapEvents_VermilionCity @ 0x83B5648 - .4byte gMapScripts_VermilionCity @ 0x81668DC + .4byte VermilionCity_MapEvents @ 0x83B5648 + .4byte VermilionCity_MapScripts @ 0x81668DC .4byte VermilionCity_MapConnections @ 0x835283C .2byte BGM_FRLG_VERMILION_CITY .2byte 83 diff --git a/data/maps/VermilionCity_Gym/header.inc b/data/maps/VermilionCity_Gym/header.inc index a3cf66201..d80a1d2f1 100644 --- a/data/maps/VermilionCity_Gym/header.inc +++ b/data/maps/VermilionCity_Gym/header.inc @@ -1,7 +1,7 @@ VermilionCity_Gym:: @ 83511B0 .4byte VermilionCity_Gym_Layout @ 0x82D6E28 - .4byte gMapEvents_VermilionCity_Gym @ 0x83BAFD0 - .4byte gMapScripts_VermilionCity_Gym @ 0x816B69E + .4byte VermilionCity_Gym_MapEvents @ 0x83BAFD0 + .4byte VermilionCity_Gym_MapScripts @ 0x816B69E .4byte NULL .2byte BGM_FRLG_GYM .2byte 25 diff --git a/data/maps/VermilionCity_House1/header.inc b/data/maps/VermilionCity_House1/header.inc index 73adfa317..789b28501 100644 --- a/data/maps/VermilionCity_House1/header.inc +++ b/data/maps/VermilionCity_House1/header.inc @@ -1,7 +1,7 @@ VermilionCity_House1:: @ 8351108 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House1 @ 0x83BAB6C - .4byte gMapScripts_VermilionCity_House1 @ 0x816B3A6 + .4byte VermilionCity_House1_MapEvents @ 0x83BAB6C + .4byte VermilionCity_House1_MapScripts @ 0x816B3A6 .4byte NULL .2byte BGM_FRLG_CERULEAN_CITY .2byte 6 diff --git a/data/maps/VermilionCity_House2/header.inc b/data/maps/VermilionCity_House2/header.inc index d80ed7c4f..a536abeb6 100644 --- a/data/maps/VermilionCity_House2/header.inc +++ b/data/maps/VermilionCity_House2/header.inc @@ -1,7 +1,7 @@ VermilionCity_House2:: @ 8351178 .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House2 @ 0x83BADEC - .4byte gMapScripts_VermilionCity_House2 @ 0x816B5D6 + .4byte VermilionCity_House2_MapEvents @ 0x83BADEC + .4byte VermilionCity_House2_MapScripts @ 0x816B5D6 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 6 diff --git a/data/maps/VermilionCity_House3/header.inc b/data/maps/VermilionCity_House3/header.inc index 739ca82ff..2ab2f1ee8 100644 --- a/data/maps/VermilionCity_House3/header.inc +++ b/data/maps/VermilionCity_House3/header.inc @@ -1,7 +1,7 @@ VermilionCity_House3:: @ 83511CC .4byte House1_Layout @ 0x82D5754 - .4byte gMapEvents_VermilionCity_House3 @ 0x83BB068 - .4byte gMapScripts_VermilionCity_House3 @ 0x816BAA9 + .4byte VermilionCity_House3_MapEvents @ 0x83BB068 + .4byte VermilionCity_House3_MapScripts @ 0x816BAA9 .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 6 diff --git a/data/maps/VermilionCity_Mart/header.inc b/data/maps/VermilionCity_Mart/header.inc index 06b0c1a40..d82ee87a5 100644 --- a/data/maps/VermilionCity_Mart/header.inc +++ b/data/maps/VermilionCity_Mart/header.inc @@ -1,7 +1,7 @@ VermilionCity_Mart:: @ 8351194 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_VermilionCity_Mart @ 0x83BAE60 - .4byte gMapScripts_VermilionCity_Mart @ 0x816B653 + .4byte VermilionCity_Mart_MapEvents @ 0x83BAE60 + .4byte VermilionCity_Mart_MapScripts @ 0x816B653 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/header.inc b/data/maps/VermilionCity_PokemonCenter_1F/header.inc index 0c20e889c..4f6333c60 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/header.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonCenter_1F:: @ 8351124 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_VermilionCity_PokemonCenter_1F @ 0x83BAC48 - .4byte gMapScripts_VermilionCity_PokemonCenter_1F @ 0x816B424 + .4byte VermilionCity_PokemonCenter_1F_MapEvents @ 0x83BAC48 + .4byte VermilionCity_PokemonCenter_1F_MapScripts @ 0x816B424 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/header.inc b/data/maps/VermilionCity_PokemonCenter_2F/header.inc index 34192d487..7cb7acc59 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/header.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonCenter_2F:: @ 8351140 .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_VermilionCity_PokemonCenter_2F @ 0x83BACD4 - .4byte gMapScripts_VermilionCity_PokemonCenter_2F @ 0x816B457 + .4byte VermilionCity_PokemonCenter_2F_MapEvents @ 0x83BACD4 + .4byte VermilionCity_PokemonCenter_2F_MapScripts @ 0x816B457 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/VermilionCity_PokemonFanClub/header.inc b/data/maps/VermilionCity_PokemonFanClub/header.inc index df116263d..930f0d08f 100644 --- a/data/maps/VermilionCity_PokemonFanClub/header.inc +++ b/data/maps/VermilionCity_PokemonFanClub/header.inc @@ -1,7 +1,7 @@ VermilionCity_PokemonFanClub:: @ 835115C .4byte VermilionCity_PokemonFanClub_Layout @ 0x833ABC8 - .4byte gMapEvents_VermilionCity_PokemonFanClub @ 0x83BADA8 - .4byte gMapScripts_VermilionCity_PokemonFanClub @ 0x816B47E + .4byte VermilionCity_PokemonFanClub_MapEvents @ 0x83BADA8 + .4byte VermilionCity_PokemonFanClub_MapScripts @ 0x816B47E .4byte NULL .2byte BGM_FRLG_VERMILION_CITY .2byte 273 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 8717475ee..8c6c1c85c 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_1F:: @ 834F658 .4byte VictoryRoad_1F_Layout @ 0x83043CC - .4byte gMapEvents_VictoryRoad_1F @ 0x83AF5C0 - .4byte gMapScripts_VictoryRoad_1F @ 0x8160F05 + .4byte VictoryRoad_1F_MapEvents @ 0x83AF5C0 + .4byte VictoryRoad_1F_MapScripts @ 0x8160F05 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 125 diff --git a/data/maps/VictoryRoad_2F/header.inc b/data/maps/VictoryRoad_2F/header.inc index 6d96addf8..5c1c06256 100644 --- a/data/maps/VictoryRoad_2F/header.inc +++ b/data/maps/VictoryRoad_2F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_2F:: @ 834F674 .4byte VictoryRoad_2F_Layout @ 0x8304CB4 - .4byte gMapEvents_VictoryRoad_2F @ 0x83AF774 - .4byte gMapScripts_VictoryRoad_2F @ 0x8160F92 + .4byte VictoryRoad_2F_MapEvents @ 0x83AF774 + .4byte VictoryRoad_2F_MapScripts @ 0x8160F92 .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 126 diff --git a/data/maps/VictoryRoad_3F/header.inc b/data/maps/VictoryRoad_3F/header.inc index 7e23cd6ee..85fb25b59 100644 --- a/data/maps/VictoryRoad_3F/header.inc +++ b/data/maps/VictoryRoad_3F/header.inc @@ -1,7 +1,7 @@ VictoryRoad_3F:: @ 834F690 .4byte VictoryRoad_3F_Layout @ 0x8305494 - .4byte gMapEvents_VictoryRoad_3F @ 0x83AF8E0 - .4byte gMapScripts_VictoryRoad_3F @ 0x81610AA + .4byte VictoryRoad_3F_MapEvents @ 0x83AF8E0 + .4byte VictoryRoad_3F_MapScripts @ 0x81610AA .4byte NULL .2byte BGM_FRLG_MT_MOON .2byte 127 diff --git a/data/maps/ViridianCity/header.inc b/data/maps/ViridianCity/header.inc index a2442e278..6c027f11f 100644 --- a/data/maps/ViridianCity/header.inc +++ b/data/maps/ViridianCity/header.inc @@ -1,7 +1,7 @@ ViridianCity:: @ 8350634 .4byte ViridianCity_Layout @ 0x82DE3E4 - .4byte gMapEvents_ViridianCity @ 0x83B4FE0 - .4byte gMapScripts_ViridianCity @ 0x81658D3 + .4byte ViridianCity_MapEvents @ 0x83B4FE0 + .4byte ViridianCity_MapScripts @ 0x81658D3 .4byte ViridianCity_MapConnections @ 0x8352798 .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 79 diff --git a/data/maps/ViridianCity_Gym/header.inc b/data/maps/ViridianCity_Gym/header.inc index 52708bd39..5edc31d15 100644 --- a/data/maps/ViridianCity_Gym/header.inc +++ b/data/maps/ViridianCity_Gym/header.inc @@ -1,7 +1,7 @@ ViridianCity_Gym:: @ 8350DDC .4byte ViridianCity_Gym_Layout @ 0x82D86AC - .4byte gMapEvents_ViridianCity_Gym @ 0x83B9B78 - .4byte gMapScripts_ViridianCity_Gym @ 0x8169EC9 + .4byte ViridianCity_Gym_MapEvents @ 0x83B9B78 + .4byte ViridianCity_Gym_MapScripts @ 0x8169EC9 .4byte NULL .2byte BGM_FRLG_GYM .2byte 37 diff --git a/data/maps/ViridianCity_House1/header.inc b/data/maps/ViridianCity_House1/header.inc index a1112bfd1..e29f218c9 100644 --- a/data/maps/ViridianCity_House1/header.inc +++ b/data/maps/ViridianCity_House1/header.inc @@ -1,7 +1,7 @@ ViridianCity_House1:: @ 8350DC0 .4byte ViridianCity_House1_Layout @ 0x833AEAC - .4byte gMapEvents_ViridianCity_House1 @ 0x83B9A38 - .4byte gMapScripts_ViridianCity_House1 @ 0x8169E9A + .4byte ViridianCity_House1_MapEvents @ 0x83B9A38 + .4byte ViridianCity_House1_MapScripts @ 0x8169E9A .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 276 diff --git a/data/maps/ViridianCity_House2/header.inc b/data/maps/ViridianCity_House2/header.inc index 62019f35e..c45bfff14 100644 --- a/data/maps/ViridianCity_House2/header.inc +++ b/data/maps/ViridianCity_House2/header.inc @@ -1,7 +1,7 @@ ViridianCity_House2:: @ 8350DF8 .4byte ViridianCity_House2_Layout @ 0x8338D20 - .4byte gMapEvents_ViridianCity_House2 @ 0x83B9C10 - .4byte gMapScripts_ViridianCity_House2 @ 0x816A07C + .4byte ViridianCity_House2_MapEvents @ 0x83B9C10 + .4byte ViridianCity_House2_MapScripts @ 0x816A07C .4byte NULL .2byte BGM_FRLG_VIRIDIAN_CITY .2byte 266 diff --git a/data/maps/ViridianCity_Mart/header.inc b/data/maps/ViridianCity_Mart/header.inc index 7b250540a..29cfbf0d0 100644 --- a/data/maps/ViridianCity_Mart/header.inc +++ b/data/maps/ViridianCity_Mart/header.inc @@ -1,7 +1,7 @@ ViridianCity_Mart:: @ 8350E14 .4byte Mart_Layout @ 0x82D5BCC - .4byte gMapEvents_ViridianCity_Mart @ 0x83B9C84 - .4byte gMapScripts_ViridianCity_Mart @ 0x816A1D3 + .4byte ViridianCity_Mart_MapEvents @ 0x83B9C84 + .4byte ViridianCity_Mart_MapScripts @ 0x816A1D3 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 10 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/header.inc b/data/maps/ViridianCity_PokemonCenter_1F/header.inc index 3910c6ea9..6e26020eb 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/header.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/header.inc @@ -1,7 +1,7 @@ ViridianCity_PokemonCenter_1F:: @ 8350E30 .4byte PokemonCenter_1F_Layout @ 0x82D5990 - .4byte gMapEvents_ViridianCity_PokemonCenter_1F @ 0x83B9D18 - .4byte gMapScripts_ViridianCity_PokemonCenter_1F @ 0x816A2C0 + .4byte ViridianCity_PokemonCenter_1F_MapEvents @ 0x83B9D18 + .4byte ViridianCity_PokemonCenter_1F_MapScripts @ 0x816A2C0 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 8 diff --git a/data/maps/ViridianCity_PokemonCenter_2F/header.inc b/data/maps/ViridianCity_PokemonCenter_2F/header.inc index 3fa490a6e..0b1cdbcf7 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/header.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/header.inc @@ -1,7 +1,7 @@ ViridianCity_PokemonCenter_2F:: @ 8350E4C .4byte PokemonCenter_2F_Layout @ 0x82D5AE0 - .4byte gMapEvents_ViridianCity_PokemonCenter_2F @ 0x83B9DA4 - .4byte gMapScripts_ViridianCity_PokemonCenter_2F @ 0x816A2F3 + .4byte ViridianCity_PokemonCenter_2F_MapEvents @ 0x83B9DA4 + .4byte ViridianCity_PokemonCenter_2F_MapScripts @ 0x816A2F3 .4byte NULL .2byte BGM_FRLG_POKEMON_CENTER .2byte 9 diff --git a/data/maps/ViridianForest/header.inc b/data/maps/ViridianForest/header.inc index 9a8cee281..db9e41ad1 100644 --- a/data/maps/ViridianForest/header.inc +++ b/data/maps/ViridianForest/header.inc @@ -1,7 +1,7 @@ ViridianForest:: @ 834F214 .4byte ViridianForest_Layout @ 0x82FE46C - .4byte gMapEvents_ViridianForest @ 0x83AE4D8 - .4byte gMapScripts_ViridianForest @ 0x816051F + .4byte ViridianForest_MapEvents @ 0x83AE4D8 + .4byte ViridianForest_MapScripts @ 0x816051F .4byte NULL .2byte BGM_FRLG_VIRIDIAN_FOREST .2byte 117 |