ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a constant for "no music" on maps.

Browse Source
This commit is contained in:
Phlosioneer 2019-03-10 01:12:41 -05:00 committed by huderlem
parent b67c0698c2
commit 092608aef6
23 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
"name": "BattleFrontier_BattlePyramidEmptySquare", "name": "BattleFrontier_BattlePyramidEmptySquare",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER", "region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattleFrontier_BattlePyramidTop/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
"name": "BattleFrontier_BattlePyramidTop", "name": "BattleFrontier_BattlePyramidTop",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER", "region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare01/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE01", "id": "MAP_BATTLE_PYRAMID_SQUARE01",
"name": "BattlePyramidSquare01", "name": "BattlePyramidSquare01",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare02/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE02", "id": "MAP_BATTLE_PYRAMID_SQUARE02",
"name": "BattlePyramidSquare02", "name": "BattlePyramidSquare02",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare03/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE03", "id": "MAP_BATTLE_PYRAMID_SQUARE03",
"name": "BattlePyramidSquare03", "name": "BattlePyramidSquare03",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare04/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE04", "id": "MAP_BATTLE_PYRAMID_SQUARE04",
"name": "BattlePyramidSquare04", "name": "BattlePyramidSquare04",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare05/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE05", "id": "MAP_BATTLE_PYRAMID_SQUARE05",
"name": "BattlePyramidSquare05", "name": "BattlePyramidSquare05",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare06/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE06", "id": "MAP_BATTLE_PYRAMID_SQUARE06",
"name": "BattlePyramidSquare06", "name": "BattlePyramidSquare06",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare07/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE07", "id": "MAP_BATTLE_PYRAMID_SQUARE07",
"name": "BattlePyramidSquare07", "name": "BattlePyramidSquare07",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare08/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE08", "id": "MAP_BATTLE_PYRAMID_SQUARE08",
"name": "BattlePyramidSquare08", "name": "BattlePyramidSquare08",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare09/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE09", "id": "MAP_BATTLE_PYRAMID_SQUARE09",
"name": "BattlePyramidSquare09", "name": "BattlePyramidSquare09",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare10/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE10", "id": "MAP_BATTLE_PYRAMID_SQUARE10",
"name": "BattlePyramidSquare10", "name": "BattlePyramidSquare10",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare11/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE11", "id": "MAP_BATTLE_PYRAMID_SQUARE11",
"name": "BattlePyramidSquare11", "name": "BattlePyramidSquare11",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare12/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE12", "id": "MAP_BATTLE_PYRAMID_SQUARE12",
"name": "BattlePyramidSquare12", "name": "BattlePyramidSquare12",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare13/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE13", "id": "MAP_BATTLE_PYRAMID_SQUARE13",
"name": "BattlePyramidSquare13", "name": "BattlePyramidSquare13",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare14/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE14", "id": "MAP_BATTLE_PYRAMID_SQUARE14",
"name": "BattlePyramidSquare14", "name": "BattlePyramidSquare14",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare15/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE15", "id": "MAP_BATTLE_PYRAMID_SQUARE15",
"name": "BattlePyramidSquare15", "name": "BattlePyramidSquare15",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare16/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE16", "id": "MAP_BATTLE_PYRAMID_SQUARE16",
"name": "BattlePyramidSquare16", "name": "BattlePyramidSquare16",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16", "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC", "region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BirthIsland_Exterior/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BIRTH_ISLAND_EXTERIOR", "id": "MAP_BIRTH_ISLAND_EXTERIOR",
"name": "BirthIsland_Exterior", "name": "BirthIsland_Exterior",
"layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND_2", "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/BirthIsland_Harbor/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_BIRTH_ISLAND_HARBOR", "id": "MAP_BIRTH_ISLAND_HARBOR",
"name": "BirthIsland_Harbor", "name": "BirthIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR", "layout": "LAYOUT_ISLAND_HARBOR",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND_2", "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
data/maps/CaveOfOrigin_B1F/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_B1F", "id": "MAP_CAVE_OF_ORIGIN_B1F",
"name": "CaveOfOrigin_B1F", "name": "CaveOfOrigin_B1F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_1",

2
data/maps/InsideOfTruck/map.json
View File

@ -2,7 +2,7 @@
"id": "MAP_INSIDE_OF_TRUCK", "id": "MAP_INSIDE_OF_TRUCK",
"name": "InsideOfTruck", "name": "InsideOfTruck",
"layout": "LAYOUT_INSIDE_OF_TRUCK", "layout": "LAYOUT_INSIDE_OF_TRUCK",
"music": "65535", "music": "MUS_NONE",
"region_map_section": "MAPSEC_INSIDE_OF_TRUCK", "region_map_section": "MAPSEC_INSIDE_OF_TRUCK",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_NONE", "weather": "WEATHER_NONE",

2
include/constants/songs.h
View File

@ -538,4 +538,6 @@
#define MUS_ROUTE_118 0x7FFF // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic(). #define MUS_ROUTE_118 0x7FFF // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic().
#define MUS_NONE 0xFFFF
#endif // GUARD_CONSTANTS_SONGS_H #endif // GUARD_CONSTANTS_SONGS_H