diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json index 14a2e7d237..3f4739b26b 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", "name": "BattleFrontier_BattlePyramidEmptySquare", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index fcb4594267..d73dc16923 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", "name": "BattleFrontier_BattlePyramidTop", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index 2b0d26de03..d4cbfd71d9 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE01", "name": "BattlePyramidSquare01", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index 32b0ad7ec3..e68b71284f 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE02", "name": "BattlePyramidSquare02", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index bbec7daa4d..8a495158e7 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE03", "name": "BattlePyramidSquare03", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index 8f63efd06f..e413a7e5fc 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE04", "name": "BattlePyramidSquare04", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index 7e26a9ee36..d16a87646e 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE05", "name": "BattlePyramidSquare05", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index 289a1e5c2e..ddf011814a 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE06", "name": "BattlePyramidSquare06", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index 7452345476..8719c6d25c 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE07", "name": "BattlePyramidSquare07", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index cac7ed96e2..54cfa4fe80 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE08", "name": "BattlePyramidSquare08", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index b5a1113346..67b9ceb1fe 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE09", "name": "BattlePyramidSquare09", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 5171d112e4..0a5e88bf7f 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE10", "name": "BattlePyramidSquare10", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index 58ac0476f3..5dc7736a3a 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE11", "name": "BattlePyramidSquare11", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index 648c3e3a65..dcb57812d9 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE12", "name": "BattlePyramidSquare12", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index c9342b3b9e..d277c5b1bc 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE13", "name": "BattlePyramidSquare13", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 6f94619676..5727356edb 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE14", "name": "BattlePyramidSquare14", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 3aa2571f66..62c7e34f33 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE15", "name": "BattlePyramidSquare15", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index 70b677c34f..a69a0ed5a3 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_PYRAMID_SQUARE16", "name": "BattlePyramidSquare16", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index c87f39fb8c..c3e5ddddf6 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_BIRTH_ISLAND_EXTERIOR", "name": "BirthIsland_Exterior", "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BIRTH_ISLAND_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index b212247bb1..48937d4824 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BIRTH_ISLAND_HARBOR", "name": "BirthIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_BIRTH_ISLAND_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 2a764c677d..ac3baeaf87 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B1F", "name": "CaveOfOrigin_B1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index eefeed3654..ff76eb7748 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -2,7 +2,7 @@ "id": "MAP_INSIDE_OF_TRUCK", "name": "InsideOfTruck", "layout": "LAYOUT_INSIDE_OF_TRUCK", - "music": "65535", + "music": "MUS_NONE", "region_map_section": "MAPSEC_INSIDE_OF_TRUCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/include/constants/songs.h b/include/constants/songs.h index a459edd241..14b766965d 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -538,4 +538,6 @@ #define MUS_ROUTE_118 0x7FFF // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic(). +#define MUS_NONE 0xFFFF + #endif // GUARD_CONSTANTS_SONGS_H