diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-12 21:47:04 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-12 21:47:04 -0500 |
| commit | d5eb94330a9c626aaf72b5e5d44f7aaf1da0d00c (patch) | |
| tree | f6dd6a9d350de39841908970696c75b54d9d70f0 | |
| parent | 7d375972ba0e5a8a17fecbd223dd6de6e87b6090 (diff) | |
Use region map section constants in map headers
519 files changed, 519 insertions, 518 deletions
diff --git a/data/maps.s b/data/maps.s index 91c108c7a..8a0c2d43a 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,4 +1,5 @@ #include "constants/maps.h" +#include "constants/region_map_sections.h" #include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 0348798fc..a07a66947 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -5,7 +5,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4 .4byte 0x0 .2byte MUS_DAN02 .2byte 195 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 2ce374617..118d91860 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Corridors_1F: @ 84844C4 .4byte 0x0 .2byte MUS_DAN02 .2byte 187 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index e8d5fc419..6b743af3a 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC .4byte 0x0 .2byte MUS_DAN02 .2byte 189 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index cac71c430..da8f1f124 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Deck: @ 84844A8 .4byte 0x0 .2byte MUS_DAN02 .2byte 186 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index c03eba0b8..e83f9a020 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -5,7 +5,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC .4byte 0x0 .2byte MUS_DAN02 .2byte 289 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index efa3a0bb9..b6b48d652 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -5,7 +5,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 .4byte 0x0 .2byte MUS_DAN02 .2byte 310 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index e2021ea85..3282054cb 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Room_B1F: @ 848456C .4byte 0x0 .2byte MUS_DAN02 .2byte 193 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 227bf3e8f..4d5eead34 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_1F: @ 8484588 .4byte 0x0 .2byte MUS_DAN02 .2byte 194 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 55d228f47..ddac73f8e 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534 .4byte 0x0 .2byte MUS_DAN02 .2byte 191 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 62991d12e..304180955 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms_1F: @ 84844E0 .4byte 0x0 .2byte MUS_DAN02 .2byte 188 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 7838b8875..b9be9d667 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms_B1F: @ 8484518 .4byte 0x0 .2byte MUS_DAN02 .2byte 190 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 11 .byte 4 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index cc9db3443..e73f1c5d9 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Underwater1: @ 8484550 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 192 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 14 .byte 5 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 87650f5b2..cb7f00a6f 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -5,7 +5,7 @@ AbandonedShip_Underwater2: @ 84845C0 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 196 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte 14 .byte 5 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 2361bf769..1c390ec99 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -5,7 +5,7 @@ AlteringCave: @ 8484A58 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 420 - .byte 210 + .byte MAPSEC_ALTERING_CAVE_2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 5e958c6bd..5cce523f9 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -5,7 +5,7 @@ AncientTomb: @ 8484630 .4byte 0x0 .2byte MUS_MABOROSI .2byte 281 - .byte 83 + .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index afbba5738..31085dd4c 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -5,7 +5,7 @@ AquaHideout_1F: @ 8484144 .4byte 0x0 .2byte MUS_AJITO .2byte 143 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 079c18ee9..984d16740 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -5,7 +5,7 @@ AquaHideout_B1F: @ 8484160 .4byte 0x0 .2byte MUS_AJITO .2byte 144 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 8089a1634..230c2b7d0 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -5,7 +5,7 @@ AquaHideout_B2F: @ 848417C .4byte 0x0 .2byte MUS_AJITO .2byte 145 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 8 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index a643b729e..c2dc76096 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 .4byte 0x0 .2byte MUS_AJITO .2byte 316 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index bb82dba18..cc01983a9 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 .4byte 0x0 .2byte MUS_AJITO .2byte 317 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index 1fa34aab4..8adc7f2ba 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -5,7 +5,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710 .4byte 0x0 .2byte MUS_AJITO .2byte 318 - .byte 197 + .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index a8d91737e..33d974804 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -5,7 +5,7 @@ ArtisanCave_1F: @ 84849B0 .4byte 0x0 .2byte MUS_DAN01 .2byte 401 - .byte 202 + .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index a82cd93f6..8ff225a8e 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -5,7 +5,7 @@ ArtisanCave_B1F: @ 8484994 .4byte 0x0 .2byte MUS_DAN01 .2byte 400 - .byte 202 + .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 7a8afda58..927137cf0 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 .4byte 0x0 .2byte MUS_B_ARENA .2byte 356 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index 5312dd0fe..332363738 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 .4byte 0x0 .2byte MUS_B_ARENA .2byte 355 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 3f5e0ff4e..541613f53 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C .4byte 0x0 .2byte MUS_B_ARENA .2byte 354 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 3edfad730..6ddf3fb45 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 .4byte 0x0 .2byte MUS_B_DOME .2byte 335 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 133115e33..25c5d684f 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 .4byte 0x0 .2byte MUS_B_DOME1 .2byte 333 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 26813d1f1..be93189ab 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334 .4byte 0x0 .2byte MUS_B_DOME1 .2byte 332 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index e25a62ce8..592300353 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C .4byte 0x0 .2byte MUS_B_DOME .2byte 334 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index f3050926a..c672d86cd 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 .4byte 0x0 .2byte MUS_B_FACTORY .2byte 348 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 7da242183..1fa0645a3 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 .4byte 0x0 .2byte MUS_B_FACTORY .2byte 346 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index eb6e06a0f..766e9689b 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC .4byte 0x0 .2byte MUS_B_FACTORY .2byte 347 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index b03d993fa..696e41601 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC .4byte 0x0 .2byte MUS_B_PALACE .2byte 344 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 4b62687e7..18ddced68 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 .4byte 0x0 .2byte MUS_B_PALACE .2byte 343 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 8104eadfc..cc723eb42 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 .4byte 0x0 .2byte MUS_B_PALACE .2byte 342 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index a2b84a22c..955b0be42 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 .4byte 0x0 .2byte MUS_B_TUBE .2byte 350 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index 96d249ab9..e75761bed 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 .4byte 0x0 .2byte MUS_B_TUBE .2byte 349 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index 58a662bb3..e5ea8a3ef 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 .4byte 0x0 .2byte MUS_B_TUBE .2byte 352 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 5dde0fc15..8111043c6 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 .4byte 0x0 .2byte MUS_B_TUBE .2byte 353 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 1d8848d23..2395feb52 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .4byte 0x0 .2byte MUS_B_TUBE .2byte 358 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index b1178e0a0..f6b0e6351 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C .4byte 0x0 .2byte MUS_B_TUBE .2byte 351 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 069dc6f76..fca127f5f 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 .4byte 0x0 .2byte MUS_B_TOWER .2byte 398 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index f2eccb9f4..a5eda44ef 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 .4byte 0x0 .2byte 65535 .2byte 361 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index ed68e86c7..06fd632f8 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 .4byte 0x0 .2byte MUS_PYRAMID .2byte 360 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index 9e9508e7e..140a5d4e8 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattlePyramidTop: @ 8485430 .4byte 0x0 .2byte 65535 .2byte 378 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 32b789720..fdf167b9f 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C .4byte 0x0 .2byte MUS_SATTOWER .2byte 268 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index a9eb2b2c5..157a9f0ae 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 .4byte 0x0 .2byte MUS_SATTOWER .2byte 268 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 361e6be03..de71a7dc6 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 .4byte 0x0 .2byte MUS_SATTOWER .2byte 267 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index ccdcb013f..1ba6d43c9 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC .4byte 0x0 .2byte MUS_SATTOWER .2byte 391 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index 112c7f938..d3e6216d2 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 .4byte 0x0 .2byte MUS_SATTOWER .2byte 266 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 6e0e3b470..db62f0be3 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 .4byte 0x0 .2byte MUS_SATTOWER .2byte 264 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index cc55ae591..5a25ffafa 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 .4byte 0x0 .2byte MUS_SATTOWER .2byte 390 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 44acc4b6a..21e01eb7d 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge1: @ 84855B8 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index 69a6dba30..ad875cc4e 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge2: @ 84855F0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 397 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 3a18ce347..8ce5169d7 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge3: @ 848560C .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index e052e6ce6..11f40472b 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge4: @ 8485628 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index a6fa1470f..743ccd512 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge5: @ 8485660 .4byte 0x0 .2byte MUS_B_TOWER .2byte 397 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index ec6cfb105..b6192f8a9 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge6: @ 848567C .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 5124822a8..96843d502 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge7: @ 8485698 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 46fe25e2d..9a320a4bf 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge8: @ 84856D0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 24e7b3005..999ba6ce0 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Lounge9: @ 84856EC .4byte 0x0 .2byte MUS_B_TOWER .2byte 429 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 1067fc70c..2285a9e3f 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -5,7 +5,7 @@ BattleFrontier_Mart: @ 8485740 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index f9dc82cba..0f49f1e4b 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -5,7 +5,7 @@ BattleFrontier_OutsideEast: @ 84852C4 .4byte BattleFrontier_OutsideEast_MapConnections .2byte MUS_B_FRONTIER .2byte 345 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 3 diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 319ecec6a..bbef1d1c7 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -5,7 +5,7 @@ BattleFrontier_OutsideWest: @ 84851AC .4byte BattleFrontier_OutsideWest_MapConnections .2byte MUS_B_FRONTIER .2byte 265 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 3 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 22e3ff616..2b39d2cf6 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 361c58a04..740141748 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 340ba9597..8036032e3 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -5,7 +5,7 @@ BattleFrontier_RankingHall: @ 848559C .4byte 0x0 .2byte MUS_BIJYUTU .2byte 396 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 8f395bae4..236698cd2 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -5,7 +5,7 @@ BattleFrontier_ReceptionGate: @ 84856B4 .4byte 0x0 .2byte MUS_B_TOWER .2byte 399 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index f0e0be773..b7468a9d2 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -5,7 +5,7 @@ BattleFrontier_ScottsHouse: @ 8485644 .4byte 0x0 .2byte MUS_B_TOWER .2byte 430 - .byte 58 + .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index 7ed6b181b..dc3deeb48 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare01: @ 8484F60 .4byte 0x0 .2byte 65535 .2byte 362 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 9eb6ef754..8d65a6fa6 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare02: @ 8484F7C .4byte 0x0 .2byte 65535 .2byte 363 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 3f07295ae..c3bf3376d 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare03: @ 8484F98 .4byte 0x0 .2byte 65535 .2byte 364 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 978c4f466..c001abc53 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare04: @ 8484FB4 .4byte 0x0 .2byte 65535 .2byte 365 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index 09a7e4703..e96d7cac7 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare05: @ 8484FD0 .4byte 0x0 .2byte 65535 .2byte 366 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index e99531da8..440eac549 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare06: @ 8484FEC .4byte 0x0 .2byte 65535 .2byte 367 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 13c23c24b..f467dfd7d 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare07: @ 8485008 .4byte 0x0 .2byte 65535 .2byte 368 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index a12b6016e..00c45e577 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare08: @ 8485024 .4byte 0x0 .2byte 65535 .2byte 369 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 486c74bc0..27a33d4b0 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare09: @ 8485040 .4byte 0x0 .2byte 65535 .2byte 370 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index a73718125..1507f0518 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare10: @ 848505C .4byte 0x0 .2byte 65535 .2byte 371 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index eac3cb1c7..98c08a116 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare11: @ 8485078 .4byte 0x0 .2byte 65535 .2byte 372 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index a1d5585c8..39cc4061a 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare12: @ 8485094 .4byte 0x0 .2byte 65535 .2byte 373 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 1c67b55e7..b4b1a281d 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare13: @ 84850B0 .4byte 0x0 .2byte 65535 .2byte 374 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 9dcea14fa..407cf0024 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare14: @ 84850CC .4byte 0x0 .2byte 65535 .2byte 375 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 0429cbb0b..37d8c75cb 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare15: @ 84850E8 .4byte 0x0 .2byte 65535 .2byte 376 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index ea4627aa5..f264ace73 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -5,7 +5,7 @@ BattlePyramidSquare16: @ 8485104 .4byte 0x0 .2byte 65535 .2byte 377 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 069bbc99c..04a62dd6b 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -5,7 +5,7 @@ BirthIsland_Exterior: @ 8485794 .4byte 0x0 .2byte 65535 .2byte 404 - .byte 200 + .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index e9dc265f5..e3b8a21f3 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -5,7 +5,7 @@ BirthIsland_Harbor: @ 84857B0 .4byte 0x0 .2byte 65535 .2byte 405 - .byte 200 + .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 0fa252cc5..c25c0d82b 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_1F: @ 84842E8 .4byte 0x0 .2byte MUS_DAN03 .2byte 158 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 629806ad6..b5eacd7d9 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B1F: @ 8484358 .4byte 0x0 .2byte 65535 .2byte 162 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index b3e4dea97..5cda3da60 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_Entrance: @ 84842CC .4byte 0x0 .2byte MUS_DAN03 .2byte 157 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 1edd4c6c2..762fb4115 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 .4byte 0x0 .2byte MUS_DAN03 .2byte 159 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 0 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 6b046b61a..bd77221f6 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 .4byte 0x0 .2byte MUS_DAN03 .2byte 160 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 6 .byte 4 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 819afc08f..a5597e4e9 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -5,7 +5,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C .4byte 0x0 .2byte MUS_DAN03 .2byte 161 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte 6 .byte 4 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 8f076bf77..009a279e1 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -5,7 +5,7 @@ DesertRuins: @ 8483F68 .4byte 0x0 .2byte MUS_MABOROSI .2byte 131 - .byte 82 + .byte MAPSEC_DESERT_RUINS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 2a420d703..9d4bec918 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -5,7 +5,7 @@ DesertUnderpass: @ 8484978 .4byte 0x0 .2byte MUS_TOZAN .2byte 389 - .byte 209 + .byte MAPSEC_DESERT_UNDERPASS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7c6638aed..c6fb45581 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -5,7 +5,7 @@ DewfordTown: @ 84825EC .4byte DewfordTown_MapConnections .2byte MUS_HIGHTOWN .2byte 12 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index fcb55ee29..24866ee7a 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -5,7 +5,7 @@ DewfordTown_Gym: @ 8482C60 .4byte 0x0 .2byte MUS_GIM .2byte 65 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 31af0f14d..dfa5daf1f 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -5,7 +5,7 @@ DewfordTown_Hall: @ 8482C7C .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 66 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index c317b12bb..94c735b59 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -5,7 +5,7 @@ DewfordTown_House1: @ 8482C0C .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 64 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 6d285c437..c27122bc5 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -5,7 +5,7 @@ DewfordTown_House2: @ 8482C98 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 67 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 99d29f69c..e7b628503 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 4d6a71785..90ec683d7 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index d8275de59..05949ab05 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -5,7 +5,7 @@ DoubleBattleColosseum: @ 8484D84 .4byte 0x0 .2byte MUS_RAINBOW .2byte 224 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 890d8b79f..7ba0b694b 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -5,7 +5,7 @@ EverGrandeCity: @ 8482598 .4byte EverGrandeCity_MapConnections .2byte MUS_RAINBOW .2byte 9 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index e239ed146..1e3591b8a 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C .4byte 0x0 .2byte MUS_C_ROAD .2byte 115 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 0a4878176..0de64f823 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20 .4byte 0x0 .2byte MUS_C_ROAD .2byte 114 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index dbc20fd80..2c6ad7097 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 .4byte 0x0 .2byte MUS_C_ROAD .2byte 113 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 4dacefc77..eba002828 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall1: @ 8483C58 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 0c160c76e..7c932e333 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall2: @ 8483C74 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index da2ef5259..ff5999475 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall3: @ 8483C90 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index da0b96380..4051a8722 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall4: @ 8483CAC .4byte 0x0 .2byte MUS_C_ROAD .2byte 315 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 0c541bd58..1f6ade600 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_Hall5: @ 8483CC8 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 786b7c598..22bb385c3 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_HallOfFame: @ 8483D00 .4byte 0x0 .2byte MUS_EIKOU_R .2byte 298 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 2e7bef16d..267f341d5 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 .4byte 0x0 .2byte MUS_C_ROAD .2byte 112 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 613b47446..1eb362f60 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 63539b7a1..3bfe680e5 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index d99e18907..e81864220 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 .4byte 0x0 .2byte MUS_POKECEN .2byte 270 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 61d0b857a..59e523449 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 3855eb87a..a2f5ebef3 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom: @ 8483BCC .4byte 0x0 .2byte MUS_C_ROAD .2byte 111 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index c26b91f29..caece3a22 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -5,7 +5,7 @@ FallarborTown: @ 8482624 .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA .2byte 14 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index be81ffe6e..17a58396f 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC .4byte 0x0 .2byte MUS_B_TOWER .2byte 386 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 5f2023a71..adf2570af 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index ba86df464..60d07ff5b 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ FallarborTown_BattleTentLobby: @ 8482D94 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 443a4dc27..e07cc4ee8 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -5,7 +5,7 @@ FallarborTown_House1: @ 8482E20 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 59 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 17cadef2b..5e50c8271 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -5,7 +5,7 @@ FallarborTown_House2: @ 8482E3C .4byte 0x0 .2byte MUS_TONEKUSA .2byte 60 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 6e8aa3ef3..ee3d1bb7a 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -5,7 +5,7 @@ FallarborTown_Mart: @ 8482D78 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 515518d9a..ea7d76a36 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 2c67be178..a2e45e006 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 5d7879d64..1b2e2300a 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -5,7 +5,7 @@ FarawayIsland_Entrance: @ 848575C .4byte 0x0 .2byte MUS_DAN02 .2byte 402 - .byte 201 + .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index dd29fcc26..2ac52de61 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -5,7 +5,7 @@ FarawayIsland_Interior: @ 8485778 .4byte 0x0 .2byte MUS_DAN02 .2byte 403 - .byte 201 + .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte 11 .byte 8 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index c02896935..5ebac1143 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -5,7 +5,7 @@ FieryPath: @ 8484048 .4byte 0x0 .2byte MUS_DAN01 .2byte 293 - .byte 74 + .byte MAPSEC_FIERY_PATH .byte 0 .byte 0 .byte 4 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index b091e166f..98c24b211 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -5,7 +5,7 @@ FortreeCity: @ 8482528 .4byte FortreeCity_MapConnections .2byte MUS_MACHI_S3 .2byte 5 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 4ebde8a93..918a988b2 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -5,7 +5,7 @@ FortreeCity_DecorationShop: @ 848361C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 255 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index eb241b368..21b280322 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -5,7 +5,7 @@ FortreeCity_Gym: @ 848353C .4byte 0x0 .2byte MUS_GIM .2byte 100 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 06dd18e1c..9c933f5bb 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -5,7 +5,7 @@ FortreeCity_House1: @ 8483520 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 62461784f..a339e9dde 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -5,7 +5,7 @@ FortreeCity_House2: @ 84835AC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 54297f446..45f8e2e05 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -5,7 +5,7 @@ FortreeCity_House3: @ 84835C8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index 71002c7da..cdd8de330 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -5,7 +5,7 @@ FortreeCity_House4: @ 84835E4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 6513cde1e..3017bae96 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -5,7 +5,7 @@ FortreeCity_House5: @ 8483600 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 18cb7b971..1dd682c08 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -5,7 +5,7 @@ FortreeCity_Mart: @ 8483590 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index ae2b8e0e8..920f961bf 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ FortreeCity_PokemonCenter_1F: @ 8483558 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index adb7a7bde..197901ce7 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ FortreeCity_PokemonCenter_2F: @ 8483574 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 3d29c272a..af8cc27b7 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -5,7 +5,7 @@ GraniteCave_1F: @ 8483F84 .4byte 0x0 .2byte MUS_DAN01 .2byte 132 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 6ab42f082..244eff08e 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -5,7 +5,7 @@ GraniteCave_B1F: @ 8483FA0 .4byte 0x0 .2byte MUS_DAN01 .2byte 133 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 95935c283..0d1aeea5a 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -5,7 +5,7 @@ GraniteCave_B2F: @ 8483FBC .4byte 0x0 .2byte MUS_DAN01 .2byte 134 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 .byte 0 .byte 4 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 0644d8cb7..2c1514b75 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom: @ 8483FD8 .4byte 0x0 .2byte MUS_DAN01 .2byte 288 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index c77ea5934..e3a316015 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -5,7 +5,7 @@ InsideOfTruck: @ 8484EF0 .4byte 0x0 .2byte 65535 .2byte 237 - .byte 84 + .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte 0 .byte 8 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 6ff291c29..14fe2e7e2 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -5,7 +5,7 @@ IslandCave: @ 8484614 .4byte 0x0 .2byte MUS_MABOROSI .2byte 280 - .byte 81 + .byte MAPSEC_ISLAND_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index f6fc90e4e..6bab46582 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -5,7 +5,7 @@ JaggedPass: @ 848402C .4byte 0x0 .2byte MUS_DAN01 .2byte 292 - .byte 76 + .byte MAPSEC_JAGGED_PASS .byte 0 .byte 0 .byte 3 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 12cc74b5f..ff1e483e0 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -5,7 +5,7 @@ LavaridgeTown: @ 8482608 .4byte LavaridgeTown_MapConnections .2byte MUS_MACHI_S4 .2byte 13 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 30cde2e9c..e7fb510f7 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Gym_1F: @ 8482CD0 .4byte 0x0 .2byte MUS_GIM .2byte 69 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 6 .byte 8 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 66d732921..1f591e8f2 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Gym_B1F: @ 8482CEC .4byte 0x0 .2byte MUS_GIM .2byte 70 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 6 .byte 8 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index c9ef33f92..bb34945c5 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_HerbShop: @ 8482CB4 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 68 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index aa8a822f5..f9e56baea 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_House: @ 8482D08 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 64 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 72d8699f1..a01610eaf 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_Mart: @ 8482D24 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index b3444dc0f..ae10ecf37 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 .4byte 0x0 .2byte MUS_POKECEN .2byte 71 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 596b0e189..1fb9fc917 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 1ec7fa26e..eb3ad0011 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -5,7 +5,7 @@ LilycoveCity: @ 8482544 .4byte LilycoveCity_MapConnections .2byte MUS_MINAMO .2byte 6 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index d0b17f863..29ec0ca38 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -5,7 +5,7 @@ LilycoveCity_ContestHall: @ 84836C4 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 106 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index ddd0d6284..6cbc84c1b 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -5,7 +5,7 @@ LilycoveCity_ContestLobby: @ 84836A8 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 105 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index ed380598b..7881cf288 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 .4byte 0x0 .2byte MUS_MINAMO .2byte 299 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 200e1b7bb..3e3a5810f 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 .4byte 0x0 .2byte MUS_MINAMO .2byte 300 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index b5135b1ff..3e490a6cd 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 .4byte 0x0 .2byte MUS_MINAMO .2byte 273 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 3a96f4c3b..991117c67 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 .4byte 0x0 .2byte MUS_MINAMO .2byte 262 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 2ad060976..af11b9d99 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 .4byte 0x0 .2byte MUS_MINAMO .2byte 257 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index e4ebc314a..dd79bf744 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 258 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index bb8cd73f7..48e90e355 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 259 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 9bc54b809..3a098b37c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_4F: @ 848384C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 260 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index cf1448ab8..a1af1c59f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 261 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index abaf3ad3f..4f8b71c7a 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -5,7 +5,7 @@ LilycoveCity_Harbor: @ 8483750 .4byte 0x0 .2byte MUS_MINAMO .2byte 88 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 3d884a5d2..903bcd845 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House1: @ 8483788 .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 3d184d345..f78304998 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House2: @ 84837A4 .4byte 0x0 .2byte MUS_MINAMO .2byte 74 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 1a818490e..49bd9d333 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House3: @ 84837C0 .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 9632ffa39..331b40645 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -5,7 +5,7 @@ LilycoveCity_House4: @ 84837DC .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 3721b4432..1b5c0ed32 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 .4byte 0x0 .2byte MUS_BIJYUTU .2byte 103 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index c5adc0fb1..cb282a135 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C .4byte 0x0 .2byte MUS_BIJYUTU .2byte 104 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 19e61cf16..3bc705498 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -5,7 +5,7 @@ LilycoveCity_MoveDeletersHouse: @ 848376C .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 782efd3d0..2dd859134 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 7db9bcb62..df902a25b 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 0e23469c1..f429787fa 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -5,7 +5,7 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 .4byte 0x0 .2byte MUS_MINAMO .2byte 107 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index bf648b5da..09869a0a5 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -5,7 +5,7 @@ LilycoveCity_UnusedMart: @ 8483718 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index dcd7be859..bcb120e6b 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -5,7 +5,7 @@ LinkContestRoom1: @ 8484DA0 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 225 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index 2afb7ae00..298bbad57 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -5,7 +5,7 @@ LinkContestRoom2: @ 8484E64 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 232 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 97f0cdcae..3c60ff649 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -5,7 +5,7 @@ LinkContestRoom3: @ 8484E80 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 233 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 9c0dfdc65..6be3dba3f 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -5,7 +5,7 @@ LinkContestRoom4: @ 8484E9C .4byte 0x0 .2byte MUS_CONTEST0 .2byte 234 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 42c2f3fdb..d929ef742 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -5,7 +5,7 @@ LinkContestRoom5: @ 8484EB8 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 235 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index f1487f334..cc2a56e79 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -5,7 +5,7 @@ LinkContestRoom6: @ 8484ED4 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 236 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 04010b50c..dbc6effd6 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -5,7 +5,7 @@ LittlerootTown: @ 84825B4 .4byte LittlerootTown_MapConnections .2byte MUS_MISHIRO .2byte 10 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index d5a87bae9..f4b411a06 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 .4byte 0x0 .2byte MUS_MISHIRO .2byte 54 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 0153a3f27..39a81acd1 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 .4byte 0x0 .2byte MUS_MISHIRO .2byte 55 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 1e72c91b5..821cacc0b 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C .4byte 0x0 .2byte MUS_MISHIRO .2byte 56 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 20e9e3f5a..711c8b381 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 .4byte 0x0 .2byte MUS_MISHIRO .2byte 57 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 8cd5eaf79..18b6d4d61 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 .4byte 0x0 .2byte MUS_ODAMAKI .2byte 58 - .byte 0 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 6158ed3cb..c82b22bc3 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_1F: @ 8484828 .4byte 0x0 .2byte MUS_AJITO .2byte 336 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index 1a685fe55..261502089 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_1R: @ 8484844 .4byte 0x0 .2byte MUS_AJITO .2byte 337 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 410522097..5032b25a6 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_2R: @ 8484860 .4byte 0x0 .2byte MUS_AJITO .2byte 338 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 407408bf3..fefbbfb8d 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_2F_3R: @ 84848EC .4byte 0x0 .2byte MUS_AJITO .2byte 380 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 228b197eb..52ad4945e 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_1R: @ 848487C .4byte 0x0 .2byte MUS_AJITO .2byte 339 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index d070dd32a..14d6eeff6 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_2R: @ 8484898 .4byte 0x0 .2byte MUS_AJITO .2byte 340 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index 24ed48ff5..8e27ddbae 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -5,7 +5,7 @@ MagmaHideout_3F_3R: @ 84848D0 .4byte 0x0 .2byte MUS_AJITO .2byte 379 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 45b5a40e6..b32ba1b05 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -5,7 +5,7 @@ MagmaHideout_4F: @ 84848B4 .4byte 0x0 .2byte MUS_AJITO .2byte 341 - .byte 198 + .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 8e3cf5a5f..41c7c1a86 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -5,7 +5,7 @@ MarineCave_End: @ 8484A04 .4byte 0x0 .2byte MUS_DAN01 .2byte 413 - .byte 203 + .byte MAPSEC_MARINE_CAVE .byte 0 .byte 6 .byte 4 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 17212c4f6..1affd1213 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -5,7 +5,7 @@ MarineCave_Entrance: @ 84849E8 .4byte 0x0 .2byte MUS_DAN01 .2byte 407 - .byte 203 + .byte MAPSEC_MARINE_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index 6e83a33bd..bd14b94bf 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -5,7 +5,7 @@ MauvilleCity: @ 84824F0 .4byte MauvilleCity_MapConnections .2byte MUS_GOTOWN .2byte 3 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 8b7ecd54d..2ad55f408 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -5,7 +5,7 @@ MauvilleCity_BikeShop: @ 8483280 .4byte 0x0 .2byte MUS_GOTOWN .2byte 90 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 11a71f8c6..24dd5d97d 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -5,7 +5,7 @@ MauvilleCity_GameCorner: @ 84832B8 .4byte 0x0 .2byte MUS_CASINO .2byte 91 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index aa6430475..21aa7c991 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -5,7 +5,7 @@ MauvilleCity_Gym: @ 8483264 .4byte 0x0 .2byte MUS_GIM .2byte 89 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index db4371175..719e88b1f 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -5,7 +5,7 @@ MauvilleCity_House1: @ 848329C .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 4acd48c6d..0ab38aa38 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -5,7 +5,7 @@ MauvilleCity_House2: @ 84832D4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 3130c2d35..6e029f786 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -5,7 +5,7 @@ MauvilleCity_Mart: @ 8483328 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 5bb682b98..b2b2e21ce 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index d29063e86..aaefbba0a 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_2F: @ 848330C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 1b1371370..6cc631f65 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_1R: @ 8483EC0 .4byte 0x0 .2byte MUS_DAN03 .2byte 125 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index a96c5648e..f225660d0 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_2R: @ 8483EDC .4byte 0x0 .2byte MUS_DAN03 .2byte 126 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 11402d3d5..ea434e50b 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_B1F_1R: @ 8483EF8 .4byte 0x0 .2byte MUS_DAN03 .2byte 127 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 81c6276d2..b820706f5 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -5,7 +5,7 @@ MeteorFalls_B1F_2R: @ 8483F14 .4byte 0x0 .2byte MUS_DAN03 .2byte 128 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 22b3aaeb6..002031a7a 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -5,7 +5,7 @@ MeteorFalls_StevensCave: @ 8484A74 .4byte 0x0 .2byte MUS_DAN03 .2byte 431 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index cd0717add..a9cf03b39 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -5,7 +5,7 @@ MirageTower_1F: @ 8484908 .4byte 0x0 .2byte MUS_TOZAN .2byte 381 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index e449c3a37..0c983da36 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -5,7 +5,7 @@ MirageTower_2F: @ 8484924 .4byte 0x0 .2byte MUS_TOZAN .2byte 382 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index def0a15c9..c26f56dea 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -5,7 +5,7 @@ MirageTower_3F: @ 8484940 .4byte 0x0 .2byte MUS_TOZAN .2byte 383 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index 7c1351ea6..fc49e37a9 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -5,7 +5,7 @@ MirageTower_4F: @ 848495C .4byte 0x0 .2byte MUS_TOZAN .2byte 388 - .byte 199 + .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index fc5af866a..2c7c774d3 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -5,7 +5,7 @@ MossdeepCity: @ 8482560 .4byte MossdeepCity_MapConnections .2byte MUS_GOTOWN .2byte 7 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index 9b886677e..75074e91f 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_1F: @ 84839F0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 305 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 623b5f970..14e89db1c 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C .4byte 0x0 .2byte MUS_GOTOWN .2byte 306 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 321271f78..2ce3b8eaa 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -5,7 +5,7 @@ MossdeepCity_Gym: @ 84838BC .4byte 0x0 .2byte MUS_GIM .2byte 108 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 64dedcba6..8b7112431 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House1: @ 84838D8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index b3cf19738..72e0f38ab 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House2: @ 84838F4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index d54538b4e..8e56d6f53 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House3: @ 8483964 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 33acf2e51..d5f7f5db9 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -5,7 +5,7 @@ MossdeepCity_House4: @ 848399C .4byte 0x0 .2byte MUS_GOTOWN .2byte 80 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 586c976e7..80bc3bc38 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -5,7 +5,7 @@ MossdeepCity_Mart: @ 8483948 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 5ee83f3ce..2277dd173 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index a6659fafb..59c6ea2c8 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_PokemonCenter_2F: @ 848392C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index abfb64ee8..ea035f4be 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 275 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 3a7fce680..e1418859b 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 276 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 83a907bda..070effff6 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse: @ 8483980 .4byte 0x0 .2byte MUS_GOTOWN .2byte 327 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index bbdfaeb44..8d060e401 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -5,7 +5,7 @@ MtChimney: @ 8484010 .4byte 0x0 .2byte MUS_TOZAN .2byte 136 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 .byte 7 .byte 3 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index efd224564..7c1e49a99 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation: @ 8483DFC .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 118 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 17b7673c7..9e903d5b6 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -5,7 +5,7 @@ MtPyre_1F: @ 8484064 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 137 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index d4a35c4c6..4f3687bf2 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -5,7 +5,7 @@ MtPyre_2F: @ 8484080 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 138 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 8bf9f015a..28721a757 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -5,7 +5,7 @@ MtPyre_3F: @ 848409C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 139 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 9360976d4..a0be9d599 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -5,7 +5,7 @@ MtPyre_4F: @ 84840B8 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 140 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 193120ca8..7e756e8f5 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -5,7 +5,7 @@ MtPyre_5F: @ 84840D4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 141 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 3c390f962..b9c9f38c5 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -5,7 +5,7 @@ MtPyre_6F: @ 84840F0 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 142 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 013d84e84..aba767d32 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -5,7 +5,7 @@ MtPyre_Exterior: @ 848410C .4byte 0x0 .2byte MUS_MACHUPI .2byte 302 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 55f9d512b..10b8c44de 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -5,7 +5,7 @@ MtPyre_Summit: @ 8484128 .4byte 0x0 .2byte MUS_MACHUPI .2byte 303 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 .byte 6 .byte 3 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 9a9b308de..1d982d11f 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -5,7 +5,7 @@ NavelRock_B1F: @ 84858C8 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 427 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index 84d942a9e..ccd6e4de4 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -5,7 +5,7 @@ NavelRock_Bottom: @ 8485AC0 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 424 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 4f8237761..2d6f6cdc1 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -5,7 +5,7 @@ NavelRock_Down01: @ 848598C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 027de3f91..6146db29c 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -5,7 +5,7 @@ NavelRock_Down02: @ 84859A8 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 41ae68722..0a0601117 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -5,7 +5,7 @@ NavelRock_Down03: @ 84859C4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index a45886c16..f1014f5e8 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -5,7 +5,7 @@ NavelRock_Down04: @ 84859E0 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 2ab0c76ba..e638b9306 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -5,7 +5,7 @@ NavelRock_Down05: @ 84859FC .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index d8a17e85f..db7bbbb92 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -5,7 +5,7 @@ NavelRock_Down06: @ 8485A18 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index 0a77e6406..27c228fe8 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -5,7 +5,7 @@ NavelRock_Down07: @ 8485A34 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index a3cbed38a..5cf41ad24 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -5,7 +5,7 @@ NavelRock_Down08: @ 8485A50 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 6aed92500..b82c99552 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -5,7 +5,7 @@ NavelRock_Down09: @ 8485A6C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index bb96b7e3d..2b1826572 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -5,7 +5,7 @@ NavelRock_Down10: @ 8485A88 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index 48ed319eb..19fc50327 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -5,7 +5,7 @@ NavelRock_Down11: @ 8485AA4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index cc8d2446b..2a302f904 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -5,7 +5,7 @@ NavelRock_Entrance: @ 84858AC .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 422 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index a01250cab..4122b51cc 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -5,7 +5,7 @@ NavelRock_Exterior: @ 8485874 .4byte 0x0 .2byte MUS_RG_NANASHIMA .2byte 421 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index a6dab9d20..d6da1a2c9 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -5,7 +5,7 @@ NavelRock_Fork: @ 84858E4 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 428 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index c7243f452..f74ca0cdd 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -5,7 +5,7 @@ NavelRock_Harbor: @ 8485890 .4byte 0x0 .2byte MUS_RG_NANASHIMA .2byte 405 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index 4d1535615..464e1d3ec 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -5,7 +5,7 @@ NavelRock_Top: @ 8485970 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 423 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 11 .byte 4 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index c7484c59f..ebc18196d 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -5,7 +5,7 @@ NavelRock_Up1: @ 8485900 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index 824ef267d..d259d7af2 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -5,7 +5,7 @@ NavelRock_Up2: @ 848591C .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index 7782ca0f4..12cc5aed7 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -5,7 +5,7 @@ NavelRock_Up3: @ 8485938 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 425 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index c022d9d0b..6455c8555 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -5,7 +5,7 @@ NavelRock_Up4: @ 8485954 .4byte 0x0 .2byte MUS_RG_NANADUNGEON .2byte 426 - .byte 211 + .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 147f003d0..212457f72 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -5,7 +5,7 @@ NewMauville_Entrance: @ 8484470 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 184 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 3eda8df5e..637ac378e 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -5,7 +5,7 @@ NewMauville_Inside: @ 848448C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 185 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 3d8ae1db5..16fb5aca0 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -5,7 +5,7 @@ OldaleTown: @ 84825D0 .4byte OldaleTown_MapConnections .2byte MUS_MACHI_S4 .2byte 11 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 6039540cc..f593d5769 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -5,7 +5,7 @@ OldaleTown_House1: @ 8482B80 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 59 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 75753041f..f7a265561 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -5,7 +5,7 @@ OldaleTown_House2: @ 8482B9C .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 60 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index 043acab8d..09fb145c8 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -5,7 +5,7 @@ OldaleTown_Mart: @ 8482BF0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index d51331b61..dd942886a 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 9b9df67fd..21e6fc1f9 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 3244c01b8..3e4d88784 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -5,7 +5,7 @@ PacifidlogTown: @ 848265C .4byte PacifidlogTown_MapConnections .2byte MUS_MINAMO .2byte 16 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index b78d36a2a..95d820a95 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House1: @ 8482F8C .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 571dcd9ce..79c591b4a 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House2: @ 8482FA8 .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index fb60530a6..5222263f1 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House3: @ 8482FC4 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 7beed0a39..3774ccf3e 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House4: @ 8482FE0 .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 671c7d28e..b8789b249 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5: @ 8482FFC .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index d11ea93d2..6fdc148e3 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 00724203f..dc78b95ac 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 248c6d2ae..fab1f946c 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -5,7 +5,7 @@ PetalburgCity: @ 84824B8 .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 .2byte 1 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 739f19b74..6d3a477be 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -5,7 +5,7 @@ PetalburgCity_Gym: @ 8483034 .4byte 0x0 .2byte MUS_GIM .2byte 79 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 6aeb5deef..7f9655153 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -5,7 +5,7 @@ PetalburgCity_House1: @ 8483050 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 59 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 9595c1372..8471a0f01 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -5,7 +5,7 @@ PetalburgCity_House2: @ 848306C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 80 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 7742f8bfe..d7b062ba2 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -5,7 +5,7 @@ PetalburgCity_Mart: @ 84830C0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index af57b7bab..6dc976d05 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 1528ab624..46f83636f 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 4e207706d..b6a064a8e 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -5,7 +5,7 @@ PetalburgCity_WallysHouse: @ 8483018 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 60 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index 096f4a704..b7f1ad818 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -5,7 +5,7 @@ PetalburgWoods: @ 8483FF4 .4byte 0x0 .2byte MUS_DAN01 .2byte 135 - .byte 59 + .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte 11 .byte 3 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 7235504fa..aa3a7dd19 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -5,7 +5,7 @@ RecordCorner: @ 8484D68 .4byte 0x0 .2byte MUS_RAINBOW .2byte 223 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index ef027d1c6..34a1ef764 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -5,7 +5,7 @@ Route101: @ 8482678 .4byte Route101_MapConnections .2byte MUS_DOORO1 .2byte 17 - .byte 16 + .byte MAPSEC_ROUTE_101 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 22da93b7a..8a3b38d62 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -5,7 +5,7 @@ Route102: @ 8482694 .4byte Route102_MapConnections .2byte MUS_DOORO1 .2byte 18 - .byte 17 + .byte MAPSEC_ROUTE_102 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index 1a8825bc1..e59af7c13 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -5,7 +5,7 @@ Route103: @ 84826B0 .4byte Route103_MapConnections .2byte MUS_DOORO1 .2byte 19 - .byte 18 + .byte MAPSEC_ROUTE_103 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index f431118c1..4d600499c 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -5,7 +5,7 @@ Route104: @ 84826CC .4byte Route104_MapConnections .2byte MUS_NEXTROAD .2byte 20 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index c6335b13f..14b8c1801 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -5,7 +5,7 @@ Route104_MrBrineysHouse: @ 8483D70 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 102 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index e23012fb4..b95129158 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -5,7 +5,7 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 117 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 50f1b7b08..6c60ccfbe 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -5,7 +5,7 @@ Route104_Prototype: @ 8485AF8 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 287 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 61217a576..24cc091e9 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -5,7 +5,7 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 117 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index f7538b723..3b34c3e70 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -5,7 +5,7 @@ Route105: @ 84826E8 .4byte Route105_MapConnections .2byte MUS_NEXTROAD .2byte 21 - .byte 20 + .byte MAPSEC_ROUTE_105 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 93f4bd835..51dfac9e3 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -5,7 +5,7 @@ Route106: @ 8482704 .4byte Route106_MapConnections .2byte MUS_NEXTROAD .2byte 22 - .byte 21 + .byte MAPSEC_ROUTE_106 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index a27885664..2c61323b5 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -5,7 +5,7 @@ Route107: @ 8482720 .4byte Route107_MapConnections .2byte MUS_NEXTROAD .2byte 23 - .byte 22 + .byte MAPSEC_ROUTE_107 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 2c4cea90d..eb982f2de 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -5,7 +5,7 @@ Route108: @ 848273C .4byte Route108_MapConnections .2byte MUS_NEXTROAD .2byte 24 - .byte 23 + .byte MAPSEC_ROUTE_108 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index c9482cf31..b4e577678 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -5,7 +5,7 @@ Route109: @ 8482758 .4byte Route109_MapConnections .2byte MUS_NEXTROAD .2byte 25 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index cec1ace27..68ae187ba 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -5,7 +5,7 @@ Route109_SeashoreHouse: @ 8485B30 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 243 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index d6d394209..55bd7dbd0 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -5,7 +5,7 @@ Route110: @ 8482774 .4byte Route110_MapConnections .2byte MUS_DOORO_X1 .2byte 26 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 35a466e1e..a271dba58 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -5,7 +5,7 @@ Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 .4byte 0x0 .2byte MUS_FINECITY .2byte 256 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 2529d7366..811184bd9 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -5,7 +5,7 @@ Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C .4byte 0x0 .2byte MUS_FINECITY .2byte 256 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 99a4a694a..07a795f3a 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseCorridor: @ 8485B84 .4byte 0x0 .2byte MUS_KARAKURI .2byte 246 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 0b38de121..0ed34b2d1 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEnd: @ 8485B68 .4byte 0x0 .2byte MUS_KARAKURI .2byte 245 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 842b2f32d..5a90430fd 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance: @ 8485B4C .4byte 0x0 .2byte MUS_KARAKURI .2byte 244 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index ef5388364..c5620a2ce 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle1: @ 8485BA0 .4byte 0x0 .2byte MUS_KARAKURI .2byte 247 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index d54eb7752..202a75774 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle2: @ 8485BBC .4byte 0x0 .2byte MUS_KARAKURI .2byte 248 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 3bcf40de1..2ad32f43f 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle3: @ 8485BD8 .4byte 0x0 .2byte MUS_KARAKURI .2byte 249 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 85df95a1a..40b394a27 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle4: @ 8485BF4 .4byte 0x0 .2byte MUS_KARAKURI .2byte 250 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 2402f4cc5..9bb6f40b9 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle5: @ 8485C10 .4byte 0x0 .2byte MUS_KARAKURI .2byte 251 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 946ad91f4..fa3bc610a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle6: @ 8485C2C .4byte 0x0 .2byte MUS_KARAKURI .2byte 252 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 5de9d6400..8a9f6e6cd 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle7: @ 8485C48 .4byte 0x0 .2byte MUS_KARAKURI .2byte 253 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 750270dea..8023f4478 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -5,7 +5,7 @@ Route110_TrickHousePuzzle8: @ 8485C64 .4byte 0x0 .2byte MUS_KARAKURI .2byte 254 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 89feae870..a65a8c849 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -5,7 +5,7 @@ Route111: @ 8482790 .4byte Route111_MapConnections .2byte MUS_DOORO_X1 .2byte 27 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index c2c055af6..2f827017f 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -5,7 +5,7 @@ Route111_OldLadysRestStop: @ 8483DC4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 64 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 4cf6ca023..909277b85 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -5,7 +5,7 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 397c0060a..24589a71e 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -5,7 +5,7 @@ Route112: @ 84827AC .4byte Route112_MapConnections .2byte MUS_DOORO_X1 .2byte 28 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 72667053d..dff57293e 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -5,7 +5,7 @@ Route112_CableCarStation: @ 8483DE0 .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 118 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 87d56215e..3ed0f5455 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -5,7 +5,7 @@ Route113: @ 84827C8 .4byte Route113_MapConnections .2byte MUS_KAZANBAI .2byte 29 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index e9424580a..5298c41c2 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop: @ 8485CB8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 67 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index cda0036b3..d717c1235 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -5,7 +5,7 @@ Route114: @ 84827E4 .4byte Route114_MapConnections .2byte MUS_DOORO_X1 .2byte 30 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index efe6a1b76..01ac3e4dd 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -5,7 +5,7 @@ Route114_FossilManiacsHouse: @ 8483E18 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 119 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index c20e1b2d3..b3794190b 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -5,7 +5,7 @@ Route114_FossilManiacsTunnel: @ 8483E34 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 120 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 9a5763394..031ae74b6 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -5,7 +5,7 @@ Route114_LanettesHouse: @ 8483E50 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 121 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 97156442e..56cbab012 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -5,7 +5,7 @@ Route115: @ 8482800 .4byte Route115_MapConnections .2byte MUS_NEXTROAD .2byte 31 - .byte 30 + .byte MAPSEC_ROUTE_115 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 919dffa6f..8fef8f257 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -5,7 +5,7 @@ Route116: @ 848281C .4byte Route116_MapConnections .2byte MUS_NEXTROAD .2byte 32 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index ac319327f..8dad76407 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -5,7 +5,7 @@ Route116_TunnelersRestHouse: @ 8483E6C .4byte 0x0 .2byte MUS_GOTOWN .2byte 122 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 897d37afb..02804667c 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -5,7 +5,7 @@ Route117: @ 8482838 .4byte Route117_MapConnections .2byte MUS_DOORO_X1 .2byte 33 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index f690fa432..ea69af862 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -5,7 +5,7 @@ Route117_PokemonDayCare: @ 8483E88 .4byte 0x0 .2byte MUS_GOTOWN .2byte 123 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 3bf779b27..ad90e8f55 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -5,7 +5,7 @@ Route118: @ 8482854 .4byte Route118_MapConnections .2byte MUS_ROUTE_118 .2byte 34 - .byte 33 + .byte MAPSEC_ROUTE_118 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index cb61c3a38..af32f0bde 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -5,7 +5,7 @@ Route119: @ 8482870 .4byte Route119_MapConnections .2byte MUS_GRANROAD .2byte 35 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 754b0c245..8f966eaf4 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -5,7 +5,7 @@ Route119_House: @ 8485D28 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index fac499e3f..7d324311e 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F: @ 8485CF0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 271 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 69a351082..d2a09b1b7 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_2F: @ 8485D0C .4byte 0x0 .2byte MUS_GOTOWN .2byte 272 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 9b8d641d9..1fa502a2b 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -5,7 +5,7 @@ Route120: @ 848288C .4byte Route120_MapConnections .2byte MUS_DOORO_X3 .2byte 36 - .byte 35 + .byte MAPSEC_ROUTE_120 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 4a05c76fe..588540fd4 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -5,7 +5,7 @@ Route121: @ 84828A8 .4byte Route121_MapConnections .2byte MUS_DOORO_X3 .2byte 37 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 56a07a3fa..9bb2b86fc 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -5,7 +5,7 @@ Route121_SafariZoneEntrance: @ 8483EA4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 124 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 591501de1..d5bbaccf4 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -5,7 +5,7 @@ Route122: @ 84828C4 .4byte Route122_MapConnections .2byte MUS_DOORO_X4 .2byte 38 - .byte 37 + .byte MAPSEC_ROUTE_122 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 7d7a4590f..e3fa357dd 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -5,7 +5,7 @@ Route123: @ 84828E0 .4byte Route123_MapConnections .2byte MUS_DOORO_X4 .2byte 39 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 .byte 2 .byte 3 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index f1466f9e7..89b03ed88 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -5,7 +5,7 @@ Route123_BerryMastersHouse: @ 8485CD4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 811fb3ec7..2ad541e81 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -5,7 +5,7 @@ Route124: @ 84828FC .4byte Route124_MapConnections .2byte MUS_DOORO_X3 .2byte 40 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index a7501cddc..d68c93985 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -5,7 +5,7 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 .4byte 0x0 .2byte MUS_MINAMO .2byte 301 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 4e67b3cb6..30691d270 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -5,7 +5,7 @@ Route125: @ 8482918 .4byte Route125_MapConnections .2byte MUS_DOORO_X3 .2byte 41 - .byte 40 + .byte MAPSEC_ROUTE_125 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 13e741159..c00086a0b 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -5,7 +5,7 @@ Route126: @ 8482934 .4byte Route126_MapConnections .2byte MUS_DOORO_X3 .2byte 42 - .byte 41 + .byte MAPSEC_ROUTE_126 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index fa3ee0200..c242fe898 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -5,7 +5,7 @@ Route127: @ 8482950 .4byte Route127_MapConnections .2byte MUS_DOORO_X3 .2byte 43 - .byte 42 + .byte MAPSEC_ROUTE_127 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 08acd71f2..6ced2f320 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -5,7 +5,7 @@ Route128: @ 848296C .4byte Route128_MapConnections .2byte MUS_DOORO_X3 .2byte 44 - .byte 43 + .byte MAPSEC_ROUTE_128 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 53abdbebe..4128e5dec 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -5,7 +5,7 @@ Route129: @ 8482988 .4byte Route129_MapConnections .2byte MUS_GRANROAD .2byte 45 - .byte 44 + .byte MAPSEC_ROUTE_129 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 47b4b613c..105e4316c 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -5,7 +5,7 @@ Route130: @ 84829A4 .4byte Route130_MapConnections .2byte MUS_GRANROAD .2byte 263 - .byte 45 + .byte MAPSEC_ROUTE_130 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index b13a344fc..0151fefde 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -5,7 +5,7 @@ Route131: @ 84829C0 .4byte Route131_MapConnections .2byte MUS_GRANROAD .2byte 47 - .byte 46 + .byte MAPSEC_ROUTE_131 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index b4fe2bc0d..77392dae8 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -5,7 +5,7 @@ Route132: @ 84829DC .4byte Route132_MapConnections .2byte MUS_GRANROAD .2byte 48 - .byte 47 + .byte MAPSEC_ROUTE_132 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index e8bc66e6f..0233c4b1b 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -5,7 +5,7 @@ Route133: @ 84829F8 .4byte Route133_MapConnections .2byte MUS_GRANROAD .2byte 49 - .byte 48 + .byte MAPSEC_ROUTE_133 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 20f6dd90a..b4bc18251 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -5,7 +5,7 @@ Route134: @ 8482A14 .4byte Route134_MapConnections .2byte MUS_GRANROAD .2byte 50 - .byte 49 + .byte MAPSEC_ROUTE_134 .byte 0 .byte 2 .byte 6 diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index adce7ef75..f26674d87 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -5,7 +5,7 @@ RustboroCity: @ 848250C .4byte RustboroCity_MapConnections .2byte MUS_GOTOWN .2byte 4 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 5423772bf..b1e738b79 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -5,7 +5,7 @@ RustboroCity_CuttersHouse: @ 8483478 .4byte 0x0 .2byte MUS_GOTOWN .2byte 98 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 9e270b9fc..56dc26994 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_1F: @ 8483344 .4byte 0x0 .2byte MUS_GOTOWN .2byte 92 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index f3954aed0..65046644f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_2F: @ 8483360 .4byte 0x0 .2byte MUS_GOTOWN .2byte 93 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index c0bbdebd1..7a5968b18 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F: @ 848337C .4byte 0x0 .2byte MUS_GOTOWN .2byte 269 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 4f424b853..e9754f54f 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat1_1F: @ 8483424 .4byte 0x0 .2byte MUS_GOTOWN .2byte 313 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 49e5c1481..a07f7fba9 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat1_2F: @ 8483440 .4byte 0x0 .2byte MUS_GOTOWN .2byte 314 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 4080980a0..66e8b9e0e 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_1F: @ 84834B0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 294 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index d4ad99dbc..8a7884e58 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_2F: @ 84834CC .4byte 0x0 .2byte MUS_GOTOWN .2byte 295 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 90918421f..70e622e46 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -5,7 +5,7 @@ RustboroCity_Flat2_3F: @ 84834E8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 296 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 8aef6fe28..f5297aaa2 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -5,7 +5,7 @@ RustboroCity_Gym: @ 8483398 .4byte 0x0 .2byte MUS_GIM .2byte 94 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index c921d3a5e..e668e6327 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -5,7 +5,7 @@ RustboroCity_House1: @ 848345C .4byte 0x0 .2byte MUS_GOTOWN .2byte 97 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 6f4d6c02d..bd075650e 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -5,7 +5,7 @@ RustboroCity_House2: @ 8483494 .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 73b5d4a0b..f03668a60 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -5,7 +5,7 @@ RustboroCity_House3: @ 8483504 .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index cb82a6500..58a9f6075 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -5,7 +5,7 @@ RustboroCity_Mart: @ 8483408 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 3db96f00d..f482ba044 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 74f264702..48e731a3e 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonCenter_2F: @ 84833EC .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 3d68afc48..6948dc366 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -5,7 +5,7 @@ RustboroCity_PokemonSchool: @ 84833B4 .4byte 0x0 .2byte MUS_P_SCHOOL .2byte 95 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index d4f1fdad5..998208e80 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -5,7 +5,7 @@ RusturfTunnel: @ 8483F30 .4byte 0x0 .2byte MUS_DAN01 .2byte 129 - .byte 60 + .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte 6 .byte 4 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 046eedc85..a33e236dd 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -5,7 +5,7 @@ SSTidalCorridor: @ 8484F0C .4byte 0x0 .2byte MUS_M_BOAT .2byte 277 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 3e2f5bacb..2c627ad0b 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -5,7 +5,7 @@ SSTidalLowerDeck: @ 8484F28 .4byte 0x0 .2byte MUS_M_BOAT .2byte 278 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index c5f0aaa00..935427cae 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -5,7 +5,7 @@ SSTidalRooms: @ 8484F44 .4byte 0x0 .2byte MUS_M_BOAT .2byte 279 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index d7ad06ffa..5452be556 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -5,7 +5,7 @@ SafariZone_North: @ 8485158 .4byte SafariZone_North_MapConnections .2byte MUS_SAFARI .2byte 239 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 58685eafe..9e8be1352 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -5,7 +5,7 @@ SafariZone_Northeast: @ 848528C .4byte SafariZone_Northeast_MapConnections .2byte MUS_SAFARI .2byte 394 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 81718dc65..b3c98ee11 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -5,7 +5,7 @@ SafariZone_Northwest: @ 848513C .4byte SafariZone_Northwest_MapConnections .2byte MUS_SAFARI .2byte 238 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 92488b12d..b56865835 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -5,7 +5,7 @@ SafariZone_RestHouse: @ 8485270 .4byte 0x0 .2byte MUS_SAFARI .2byte 329 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 3ffd068c2..9780b80d9 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -5,7 +5,7 @@ SafariZone_South: @ 8485190 .4byte SafariZone_South_MapConnections .2byte MUS_SAFARI .2byte 241 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 438d3ea7f..17d73acf8 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -5,7 +5,7 @@ SafariZone_Southeast: @ 84852A8 .4byte SafariZone_Southeast_MapConnections .2byte MUS_SAFARI .2byte 395 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 5cff316ae..5c82a2c3a 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -5,7 +5,7 @@ SafariZone_Southwest: @ 8485174 .4byte SafariZone_Southwest_MapConnections .2byte MUS_SAFARI .2byte 240 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 .byte 0 .byte 3 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 543f83ebb..23aab68fe 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -5,7 +5,7 @@ ScorchedSlab: @ 84846BC .4byte 0x0 .2byte MUS_DAN01 .2byte 311 - .byte 80 + .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 3e26232dc..32e0cbb75 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Entrance: @ 84841B4 .4byte 0x0 .2byte MUS_TOZAN .2byte 147 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 29a75081f..4dd67bdb3 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room1: @ 84841D0 .4byte 0x0 .2byte MUS_TOZAN .2byte 148 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 749b4b9ee..bec8fc16a 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room2: @ 84841EC .4byte 0x0 .2byte MUS_TOZAN .2byte 149 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index 4ef0565be..3e6b0f5c8 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room3: @ 8484208 .4byte 0x0 .2byte MUS_TOZAN .2byte 150 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 0edd39d4a..a45bb4f6a 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room4: @ 8484224 .4byte 0x0 .2byte MUS_TOZAN .2byte 151 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 013f447dc..831c85394 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room5: @ 8484240 .4byte 0x0 .2byte MUS_TOZAN .2byte 152 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 9bbb14463..5e39909fc 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room6: @ 848425C .4byte 0x0 .2byte MUS_TOZAN .2byte 153 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index d4b0db267..fa9e72804 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room7: @ 8484278 .4byte 0x0 .2byte MUS_TOZAN .2byte 154 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 903e25a14..8248b89f7 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room8: @ 8484294 .4byte 0x0 .2byte MUS_TOZAN .2byte 155 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 0d43deb23..2fb1a3b70 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room9: @ 84842B0 .4byte 0x0 .2byte MUS_TOZAN .2byte 156 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte 6 .byte 4 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 4a26587bc..5e2b0c363 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -5,7 +5,7 @@ SealedChamber_InnerRoom: @ 84846A0 .4byte 0x0 .2byte MUS_MABOROSI .2byte 304 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index fd5fe39f3..1fabd6be1 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -5,7 +5,7 @@ SealedChamber_OuterRoom: @ 8484684 .4byte 0x0 .2byte MUS_MABOROSI .2byte 284 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 4e987702c..4783af7a7 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave1: @ 8484AC8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 199 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index ed22bbb04..208a27ae8 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave2: @ 8484B70 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 205 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 412d1f4af..0bdfe5f0f 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave3: @ 8484C18 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 211 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 542df3954..490214803 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_BlueCave4: @ 8484CC0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 217 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index aceddbfda..ad8dc034c 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave1: @ 8484AAC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 198 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index de95374ba..2e10374ec 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave2: @ 8484B54 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 204 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 8535b1e89..213364166 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave3: @ 8484BFC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 210 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index d73f38257..2dc17b4e0 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_BrownCave4: @ 8484CA4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 216 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 1cb6c4f5e..70dcb91af 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave1: @ 8484A90 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 197 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 744e8b24e..23f96fb4e 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave2: @ 8484B38 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 203 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index c153e74c6..68e302a71 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave3: @ 8484BE0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 209 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index be475a7ad..faf3fd44b 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_RedCave4: @ 8484C88 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 215 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 6ab9f9d94..2a98c0dd7 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub1: @ 8484B1C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 202 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 760781e47..b3ccb0446 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub2: @ 8484BC4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 208 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index cef2a4597..7e408128e 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub3: @ 8484C6C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 214 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 12fa26c3c..ea2c263bb 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -5,7 +5,7 @@ SecretBase_Shrub4: @ 8484D14 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 220 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index c5b5a2aed..e3951f3c1 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree1: @ 8484B00 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 201 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index ddea5c0bc..23e8da9b9 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree2: @ 8484BA8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 207 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 630dbb6e3..61378b8a3 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree3: @ 8484C50 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 213 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index bc6f84664..b5f601189 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -5,7 +5,7 @@ SecretBase_Tree4: @ 8484CF8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 219 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 9a6ae5438..1eee3cfed 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave1: @ 8484AE4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 200 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index da1949abe..27d5a0ecc 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave2: @ 8484B8C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 206 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index 8bfeff0f5..f2e986b1c 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave3: @ 8484C34 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 212 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index baf6b7d89..292672976 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -5,7 +5,7 @@ SecretBase_YellowCave4: @ 8484CDC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 218 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 .byte 0 .byte 9 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 2f3f34b43..3c02b2433 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 168 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 673bc6bec..b58e12335 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_HighTideInnerRoom: @ 8484454 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 169 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index c742d2b8c..c34c87a10 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 164 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 6571068ce..69aa8114e 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideIceRoom: @ 84847D4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 328 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index b6de02c7d..9fea56a0f 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 165 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 719a92c3e..3dc8cae94 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideLowerRoom: @ 848441C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 167 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 74d0ec94f..5123f9a80 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideStairsRoom: @ 8484400 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 166 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 54d003c27..9100eb6de 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -5,7 +5,7 @@ SingleBattleColosseum: @ 8484D30 .4byte 0x0 .2byte MUS_RAINBOW .2byte 221 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 3a47df473..7f55c68fb 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -5,7 +5,7 @@ SkyPillar_1F: @ 8484764 .4byte 0x0 .2byte MUS_TOZAN .2byte 322 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index a1cc8fb8f..2be149c00 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -5,7 +5,7 @@ SkyPillar_2F: @ 8484780 .4byte 0x0 .2byte MUS_TOZAN .2byte 323 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 81ac3046d..e54ede745 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -5,7 +5,7 @@ SkyPillar_3F: @ 848479C .4byte 0x0 .2byte MUS_TOZAN .2byte 324 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 10a68ddc2..9823646f4 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -5,7 +5,7 @@ SkyPillar_4F: @ 84847B8 .4byte 0x0 .2byte MUS_TOZAN .2byte 325 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index bb38a2d5d..f72124743 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -5,7 +5,7 @@ SkyPillar_5F: @ 84847F0 .4byte 0x0 .2byte MUS_TOZAN .2byte 330 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 8031521e9..8efd8c542 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -5,7 +5,7 @@ SkyPillar_Entrance: @ 848472C .4byte 0x0 .2byte MUS_TOZAN .2byte 320 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 4 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 38bb57bae..24a7a4e2b 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -5,7 +5,7 @@ SkyPillar_Outside: @ 8484748 .4byte 0x0 .2byte MUS_TOZAN .2byte 321 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 3836ab067..1f99a1cb8 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -5,7 +5,7 @@ SkyPillar_Top: @ 848480C .4byte 0x0 .2byte MUS_TOZAN .2byte 331 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 7ac123723..e617b0a91 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -5,7 +5,7 @@ SlateportCity: @ 84824D4 .4byte SlateportCity_MapConnections .2byte MUS_FINECITY .2byte 2 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 4c8c94753..c76e6230b 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentBattleRoom: @ 848314C .4byte 0x0 .2byte MUS_B_TOWER .2byte 386 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 7ea7cca9e..ddc1bfcef 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentCorridor: @ 8483130 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 1a809a567..767410cbb 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ SlateportCity_BattleTentLobby: @ 8483114 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 7f214b54c..8ec8c294b 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor: @ 84831D8 .4byte 0x0 .2byte MUS_FINECITY .2byte 88 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 4f7bc3f98..8f221fcc7 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -5,7 +5,7 @@ SlateportCity_House1: @ 8483168 .4byte 0x0 .2byte MUS_FINECITY .2byte 80 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 12389ed44..bc4fc03ce 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -5,7 +5,7 @@ SlateportCity_House2: @ 84831F4 .4byte 0x0 .2byte MUS_FINECITY .2byte 60 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index e13692bba..569969de3 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -5,7 +5,7 @@ SlateportCity_Mart: @ 8483248 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 4b0224075..88c4e349b 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 86 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 7d4272d09..e300ced6a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 87 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 8d1e8cc17..2b3d99694 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonCenter_1F: @ 8483210 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 7bf64b603..6070cab3c 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonCenter_2F: @ 848322C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 87a6c0c5b..34a3f1916 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -5,7 +5,7 @@ SlateportCity_PokemonFanClub: @ 8483184 .4byte 0x0 .2byte MUS_FINECITY .2byte 85 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index c04b411f1..d4b8e9aea 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -5,7 +5,7 @@ SlateportCity_SternsShipyard_1F: @ 84830DC .4byte 0x0 .2byte MUS_FINECITY .2byte 81 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index e3b36f4ed..894aabb9a 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -5,7 +5,7 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 .4byte 0x0 .2byte MUS_FINECITY .2byte 82 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 74469da7c..0b48dbca0 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -5,7 +5,7 @@ SootopolisCity: @ 848257C .4byte 0x0 .2byte MUS_RUNECITY .2byte 8 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 2 .byte 2 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 4200a7ed8..663a64800 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Gym_1F: @ 8483A28 .4byte 0x0 .2byte MUS_GIM .2byte 109 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 6265830e9..11bb3b502 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Gym_B1F: @ 8483A44 .4byte 0x0 .2byte MUS_GIM .2byte 110 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 2551aedc1..5eaa8d470 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House1: @ 8483AB4 .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 24e7a778a..36daf5bb2 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House2: @ 8483AD0 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 97ae23fb7..dfe26c5ea 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House3: @ 8483AEC .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index d39499132..1275ccf91 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House4: @ 8483B08 .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index d6de286cf..0d634d549 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House5: @ 8483B24 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 36460f147..9f151e737 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House6: @ 8483B40 .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 383ab24b5..7dac9a029 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -5,7 +5,7 @@ SootopolisCity_House7: @ 8483B5C .4byte 0x0 .2byte MUS_RUNECITY .2byte 307 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 792b5ae31..d0fa71556 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -5,7 +5,7 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 .4byte 0x0 .2byte MUS_RUNECITY .2byte 297 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index ac4ae5ea0..f1fc07ae2 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -5,7 +5,7 @@ SootopolisCity_Mart: @ 8483A98 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 2e5ea1f84..7828f6bbb 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 .4byte 0x0 .2byte MUS_RUNECITY .2byte 439 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index c3ffec414..5ebbff88b 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 .4byte 0x0 .2byte MUS_RUNECITY .2byte 440 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 83485cbf1..537ab1709 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index ba2bb5c0d..76493dcfa 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte 0 .byte 8 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index d0d35fea1..82948348b 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -5,7 +5,7 @@ SouthernIsland_Exterior: @ 8485238 .4byte 0x0 .2byte MUS_DAN02 .2byte 290 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte 0 .byte 3 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 1a080af1e..be575d25b 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -5,7 +5,7 @@ SouthernIsland_Interior: @ 8485254 .4byte 0x0 .2byte MUS_DAN02 .2byte 291 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte 11 .byte 3 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 900f5930f..94a871f6a 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -5,7 +5,7 @@ TerraCave_End: @ 8484A3C .4byte 0x0 .2byte MUS_DAN01 .2byte 409 - .byte 205 + .byte MAPSEC_TERRA_CAVE .byte 0 .byte 6 .byte 4 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index 02c5edb91..81c405cdf 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -5,7 +5,7 @@ TerraCave_Entrance: @ 8484A20 .4byte 0x0 .2byte MUS_DAN01 .2byte 408 - .byte 205 + .byte MAPSEC_TERRA_CAVE .byte 0 .byte 0 .byte 4 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 55afa79f3..92d6c14a7 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -5,7 +5,7 @@ TradeCenter: @ 8484D4C .4byte 0x0 .2byte MUS_RAINBOW .2byte 222 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index e5fd3b576..fba54fabd 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -5,7 +5,7 @@ TrainerHill_1F: @ 84857E8 .4byte 0x0 .2byte MUS_B_TOWER .2byte 415 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index 712c99cec..d47e960ed 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -5,7 +5,7 @@ TrainerHill_2F: @ 8485804 .4byte 0x0 .2byte MUS_B_TOWER .2byte 416 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index 92bbd40a1..60f981e3d 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -5,7 +5,7 @@ TrainerHill_3F: @ 8485820 .4byte 0x0 .2byte MUS_B_TOWER .2byte 417 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 5de769778..6b7edf22b 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -5,7 +5,7 @@ TrainerHill_4F: @ 848583C .4byte 0x0 .2byte MUS_B_TOWER .2byte 418 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 13912579d..dd5daa4e2 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -5,7 +5,7 @@ TrainerHill_Elevator: @ 8485ADC .4byte 0x0 .2byte MUS_B_TOWER .2byte 266 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index f37950d98..60422a940 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -5,7 +5,7 @@ TrainerHill_Entrance: @ 84857CC .4byte 0x0 .2byte MUS_B_TOWER .2byte 414 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index 3527f447f..c6c3e626c 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -5,7 +5,7 @@ TrainerHill_Roof: @ 8485858 .4byte 0x0 .2byte MUS_B_TOWER .2byte 419 - .byte 212 + .byte MAPSEC_TRAINER_HILL .byte 0 .byte 0 .byte 8 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index d63ca8815..6d3603bf5 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -5,7 +5,7 @@ Underwater1: @ 8482A30 .4byte Underwater1_MapConnections .2byte MUS_DEEPDEEP .2byte 274 - .byte 50 + .byte MAPSEC_UNDERWATER_124 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index a2754c69e..03230042b 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -5,7 +5,7 @@ Underwater2: @ 8482A4C .4byte Underwater2_MapConnections .2byte MUS_DEEPDEEP .2byte 51 - .byte 51 + .byte MAPSEC_UNDERWATER_125 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 8329304a8..203cf8b3c 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -5,7 +5,7 @@ Underwater3: @ 8482A68 .4byte Underwater3_MapConnections .2byte MUS_DEEPDEEP .2byte 52 - .byte 52 + .byte MAPSEC_UNDERWATER_126 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index f4f3e8c4b..b5de8aa07 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -5,7 +5,7 @@ Underwater4: @ 8482A84 .4byte Underwater4_MapConnections .2byte MUS_DEEPDEEP .2byte 53 - .byte 53 + .byte MAPSEC_UNDERWATER_127 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 043a6997e..e6a846303 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -5,7 +5,7 @@ Underwater5: @ 8482AA0 .4byte Underwater5_MapConnections .2byte MUS_DEEPDEEP .2byte 412 - .byte 208 + .byte MAPSEC_UNDERWATER_129 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 1be09d6a1..0aadca37d 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -5,7 +5,7 @@ Underwater6: @ 8482ABC .4byte Underwater6_MapConnections .2byte MUS_DEEPDEEP .2byte 410 - .byte 206 + .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 4ededa296..388c3510f 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -5,7 +5,7 @@ Underwater7: @ 8482AD8 .4byte Underwater7_MapConnections .2byte MUS_DEEPDEEP .2byte 411 - .byte 207 + .byte MAPSEC_UNDERWATER_UNK1 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 54bffb710..4aca9a734 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -5,7 +5,7 @@ Underwater_MarineCave: @ 84849CC .4byte 0x0 .2byte MUS_DAN01 .2byte 406 - .byte 204 + .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index f08f506a1..5715c5e90 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -5,7 +5,7 @@ Underwater_Route134: @ 848464C .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 282 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 6415ac787..b39773d23 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern: @ 8484198 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 146 - .byte 69 + .byte MAPSEC_UNDERWATER_128 .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index a72666d12..8ca54e9fb 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -5,7 +5,7 @@ Underwater_SealedChamber: @ 8484668 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 283 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte 14 .byte 5 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index ef9ee1612..661c4d105 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -5,7 +5,7 @@ Underwater_SootopolisCity: @ 8483F4C .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 130 - .byte 54 + .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte 14 .byte 5 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index b79ae81a2..55566ceef 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -5,7 +5,7 @@ UnionRoom: @ 8485120 .4byte 0x0 .2byte MUS_RAINBOW .2byte 393 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 4c8edd31c..79438a8d4 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_29: @ 8484DBC .4byte 0x0 .2byte MUS_NIBI .2byte 226 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 46465019e..f5a6fde39 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_30: @ 8484DD8 .4byte 0x0 .2byte MUS_NIBI .2byte 227 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 13e428cfd..cf5318be0 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_31: @ 8484DF4 .4byte 0x0 .2byte MUS_NIBI .2byte 228 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 8244c3802..538798a4c 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_32: @ 8484E10 .4byte 0x0 .2byte MUS_NIBI .2byte 229 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index b4da8dd48..c4d384729 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_33: @ 8484E2C .4byte 0x0 .2byte MUS_NIBI .2byte 230 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index bb1ce881c..3d08bf4ba 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -5,7 +5,7 @@ UnknownMap_25_34: @ 8484E48 .4byte 0x0 .2byte MUS_NIBI .2byte 231 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 047ba12ad..aa176dbfd 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -5,7 +5,7 @@ VerdanturfTown: @ 8482640 .4byte VerdanturfTown_MapConnections .2byte MUS_GOMACHI0 .2byte 15 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 2 .byte 1 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 1eef21301..bcdd211ee 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 .4byte 0x0 .2byte MUS_B_TOWER .2byte 387 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 9b8f62260..e704df2f0 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 .4byte 0x0 .2byte MUS_B_TOWER .2byte 385 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 4d1e0ca9e..7c7bc244c 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 .4byte 0x0 .2byte MUS_B_TOWER .2byte 384 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 51f3dadbd..a83a7f2fe 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 60 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index e6571b7f0..ebc8d2083 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_House: @ 8482F38 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 59 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 6f69b3aac..90b1e7e0a 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_Mart: @ 8482EAC .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index b6c5177ce..5a8e1183f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index ee657d77b..0de25d4fa 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index cb727234e..7f9a923ec 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -5,7 +5,7 @@ VerdanturfTown_WandasHouse: @ 8482F00 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 76 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte 0 .byte 8 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 35ff7bd3b..7e13504a5 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_1F: @ 8484374 .4byte 0x0 .2byte MUS_C_ROAD .2byte 163 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 0 .byte 0 .byte 4 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index b9edeeb17..107eb524f 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_B1F: @ 8484390 .4byte 0x0 .2byte MUS_C_ROAD .2byte 285 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 .byte 0 .byte 4 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index b6c80a656..3c9453154 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -5,7 +5,7 @@ VictoryRoad_B2F: @ 84843AC .4byte 0x0 .2byte MUS_C_ROAD .2byte 286 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 .byte 0 .byte 4 |