diff options
Diffstat (limited to 'data/maps')
496 files changed, 587 insertions, 587 deletions
diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index 9f113352e..84c7b2a8c 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_COLOSSEUM_2P", "name": "BattleColosseum_2P", "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 600a7a2c9..3a1be5e7d 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_COLOSSEUM_4P", "name": "BattleColosseum_4P", "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 30f3b3891..c20e19129 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -72,7 +72,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 setfieldeffectarg 1, 56 setfieldeffectarg 2, 2 dofieldeffect 68 - playbgm MUS_DEOEYE, 0 + playbgm MUS_ENCOUNTER_DEOXYS, 0 waitfieldeffect 68 applymovement 2, Movement_DeoxysApproach waitmovement 0 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 78e63ac74..6aa1807d3 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY", "name": "CeladonCity", "layout": "LAYOUT_CELADON_CITY", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 1aa8501be..aeac5b626 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_1F", "name": "CeladonCity_Condominiums_1F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 300be7ee9..756f74fb3 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_2F", "name": "CeladonCity_Condominiums_2F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 3f816ba07..cf2d74454 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_3F", "name": "CeladonCity_Condominiums_3F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index c5d43e4ef..7492b8718 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", "name": "CeladonCity_Condominiums_Roof", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 90cb8d3d9..999f32e1f 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", "name": "CeladonCity_Condominiums_RoofRoom", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 3f3363674..96a1a69a4 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -21,7 +21,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 removeobject 2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare @@ -36,7 +36,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA removeobject 2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 424719a0a..0a33592cc 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", "name": "CeladonCity_DepartmentStore_1F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index ca64f92a7..0ebc6977e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", "name": "CeladonCity_DepartmentStore_2F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index c4d3d8c3f..d59f34f42 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", "name": "CeladonCity_DepartmentStore_3F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 48062a10e..225a88043 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", "name": "CeladonCity_DepartmentStore_4F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 5f56ecbd2..09c967ec2 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", "name": "CeladonCity_DepartmentStore_5F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index d2ad4fa76..a863045a7 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "CeladonCity_DepartmentStore_Elevator", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 8b1c534c7..e13de4ef8 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", "name": "CeladonCity_DepartmentStore_Roof", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index dfd19d51f..32aed768c 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -149,7 +149,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward additem VAR_0x8009 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_ReceivedItemFromLittleGirl waitmessage waitfanfare @@ -269,7 +269,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0, 0 getitemname 0, VAR_TEMP_0 - playse SE_JIHANKI + playse SE_VEND msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut additem VAR_TEMP_0 goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 8f27be39a..b352a3967 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GAME_CORNER", "name": "CeladonCity_GameCorner", "layout": "LAYOUT_CELADON_CITY_GAME_CORNER", - "music": "MUS_SLOT", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 4e1ddae41..f0c865ef5 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -403,7 +403,7 @@ CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA end CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE - playse SE_KI_GASYAN + playse SE_UNLOCK setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0 setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1 setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 7bf6091b1..60063cd08 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", "name": "CeladonCity_GameCorner_PrizeRoom", "layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index ca8119594..09fcd2da5 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -214,7 +214,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_PlayerObtainedTheMon waitmessage waitfanfare @@ -228,7 +228,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_PlayerObtainedTheMon waitmessage waitfanfare diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 9e372584e..4cd29a4e9 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -12,7 +12,7 @@ CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "GRASS type.\p" .string "…Oh, I'm sorry, I had no idea that\n" .string "you wished to challenge me.\p" - .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$" + .string "Very well, but I shall not lose.{PLAY_BGM MUS_ENCOUNTER_GYM_LEADER}$" CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260 .string "Oh!\n" diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index e323330ba..02d7c416b 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_HOTEL", "name": "CeladonCity_Hotel", "layout": "LAYOUT_CELADON_CITY_HOTEL", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index f4855dcd9..acf95fde5 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_HOUSE1", "name": "CeladonCity_House1", "layout": "LAYOUT_HOUSE5", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 391a7daf9..5c2ca4f02 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_POKEMON_CENTER_1F", "name": "CeladonCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index b83e53cca..9431c273d 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_POKEMON_CENTER_2F", "name": "CeladonCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 5d66e4f26..71f2e4f30 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_RESTAURANT", "name": "CeladonCity_Restaurant", "layout": "LAYOUT_CELADON_CITY_RESTAURANT", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 6cf50ea13..abc495f92 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_1F", "name": "CeruleanCave_1F", "layout": "LAYOUT_CERULEAN_CAVE_1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index a75ea2017..45e4fc963 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_2F", "name": "CeruleanCave_2F", "layout": "LAYOUT_CERULEAN_CAVE_2F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index b8ad317b6..478ddf111 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_B1F", "name": "CeruleanCave_B1F", "layout": "LAYOUT_CERULEAN_CAVE_B1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 0cd5f2628..5dd7aabf0 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -33,7 +33,7 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 waitmessage waitmoncry delay 20 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setflag FLAG_SYS_SPECIAL_WILD_BATTLE diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 9ffcce5d5..282eaf4cc 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY", "name": "CeruleanCity", "layout": "LAYOUT_CERULEAN_CITY", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 7d1f455a4..b1fc63b5e 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -42,7 +42,7 @@ CeruleanCity_EventScript_RivalTriggerRight:: @ 81664B9 CeruleanCity_EventScript_Rival:: @ 81664CC textcolor 0 setvar VAR_MAP_SCENE_ROUTE22, 2 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject LOCALID_RIVAL applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter waitmovement 0 @@ -57,7 +57,7 @@ CeruleanCity_EventScript_Rival:: @ 81664CC famechecker FAMECHECKER_BILL, 0 msgbox CeruleanCity_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq CeruleanCity_EventScript_RivalStartExit compare VAR_TEMP_1, 1 @@ -179,7 +179,7 @@ CeruleanCity_EventScript_Grunt:: @ 8166603 goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_EventScript_GruntDefeated message CeruleanCity_Text_GruntIntro waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc index 7a940032d..0ae618008 100644 --- a/data/maps/CeruleanCity/text.inc +++ b/data/maps/CeruleanCity/text.inc @@ -53,7 +53,7 @@ CeruleanCity_Text_GruntIntro:: @ 817EE0E .string "…Huh?\n" .string "Me?\p" .string "I'm an innocent bystander!\n" - .string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$" + .string "Don't you believe me?{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$" CeruleanCity_Text_GruntDefeat:: @ 817EE70 .string "GRUNT: Stop! I give up!\n" diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index f7d3b573b..d7c0ea6d2 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_BIKE_SHOP", "name": "CeruleanCity_BikeShop", "layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 48077084f..45a1c2a6a 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -30,7 +30,7 @@ CeruleanCity_BikeShop_EventScript_ClerkGoodbye:: @ 816AC15 CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: @ 816AC22 msgbox CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo - msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_FAN5 + msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_OBTAIN_KEY_ITEM setflag FLAG_GOT_BICYCLE additem ITEM_BICYCLE removeitem ITEM_BIKE_VOUCHER diff --git a/data/maps/CeruleanCity_Gym/text.inc b/data/maps/CeruleanCity_Gym/text.inc index 19e8357bb..231f33c94 100644 --- a/data/maps/CeruleanCity_Gym/text.inc +++ b/data/maps/CeruleanCity_Gym/text.inc @@ -5,7 +5,7 @@ CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF .string "What is your approach when you\n" .string "catch and train POKéMON?\p" .string "My policy is an all-out offensive\n" - .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" + .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" CeruleanCity_Gym_Text_ExplainTM03:: @ 81922BF .string "TM03 teaches WATER PULSE.\p" diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index c26ec9435..006be49fa 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE1", "name": "CeruleanCity_House1", "layout": "LAYOUT_CERULEAN_CITY_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index f70b0922f..4cc6cd713 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE2", "name": "CeruleanCity_House2", "layout": "LAYOUT_CERULEAN_CITY_HOUSE2", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index db0bc7f94..0c0bb10c4 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE3", "name": "CeruleanCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index cb7c7fe0e..a2b792ede 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE4", "name": "CeruleanCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 331d7ff54..a54a593b6 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE5", "name": "CeruleanCity_House5", "layout": "LAYOUT_CERULEAN_CITY_HOUSE5", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index f5dfc959f..69dfbd2c0 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_MART", "name": "CeruleanCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 91dcfd544..7c797a653 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", "name": "CeruleanCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 929d46d1e..a706e5b4d 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", "name": "CeruleanCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index c738cff3b..9798a6be3 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND", "name": "CinnabarIsland", "layout": "LAYOUT_CINNABAR_ISLAND", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 40e8288cd..179c06a51 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -18,7 +18,7 @@ CinnabarIsland_OnTransition:: @ 8166EE1 end CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B - savebgm MUS_ANNAI + savebgm MUS_FOLLOW_ME setflag FLAG_TEMP_2 setobjectxyperm LOCALID_BILL, 15, 12 setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index f31d6f7bb..c2d95a706 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -217,7 +217,7 @@ CinnabarIsland_Gym_EventScript_Quiz1:: @ 816DC00 end CinnabarIsland_Gym_EventScript_CorrectAnswer:: @ 816DC27 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare msgbox CinnabarIsland_Gym_Text_CorrectGoOnThrough return @@ -238,7 +238,7 @@ CinnabarIsland_Gym_EventScript_Quiz1Correct:: @ 816DC43 end CinnabarIsland_Gym_EventScript_Quiz1Complete:: @ 816DC58 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor1 special DrawWholeMapView @@ -318,7 +318,7 @@ CinnabarIsland_Gym_EventScript_Quiz2Correct:: @ 816DD1C end CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor2 special DrawWholeMapView @@ -403,7 +403,7 @@ CinnabarIsland_Gym_EventScript_Quiz3Correct:: @ 816DDFA end CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor3 special DrawWholeMapView @@ -479,7 +479,7 @@ CinnabarIsland_Gym_EventScript_Quiz4Correct:: @ 816DED1 end CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor4 special DrawWholeMapView @@ -555,7 +555,7 @@ CinnabarIsland_Gym_EventScript_Quiz5Correct:: @ 816DFA8 end CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor5 special DrawWholeMapView @@ -631,7 +631,7 @@ CinnabarIsland_Gym_EventScript_Quiz6Correct:: @ 816E07F end CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor6 special DrawWholeMapView diff --git a/data/maps/CinnabarIsland_Gym/text.inc b/data/maps/CinnabarIsland_Gym/text.inc index 4543ffcc8..781238ccb 100644 --- a/data/maps/CinnabarIsland_Gym/text.inc +++ b/data/maps/CinnabarIsland_Gym/text.inc @@ -6,7 +6,7 @@ CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543 .string "and ready with intense heat!\p" .string "They incinerate all challengers!\p" .string "Hah!\n" - .string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$" + .string "You better have BURN HEAL!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" CinnabarIsland_Gym_Text_BlaineDefeat:: @ 81995FA .string "I have burned down to nothing!\n" diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index e1d02595a..0d5c16415 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_MART", "name": "CinnabarIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 9a4182fe9..83b962c02 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", "name": "CinnabarIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 844c38997..40ede6c6e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -34,8 +34,8 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A goto_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail msgbox CinnabarIsland_PokemonCenter_1F_Text_LetsGo closemessage - playbgm MUS_ANNAI, 1 - savebgm MUS_ANNAI + playbgm MUS_FOLLOW_ME, 1 + savebgm MUS_FOLLOW_ME setflag FLAG_DONT_TRANSITION_MUSIC setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 948e9850e..32fcb549f 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", "name": "CinnabarIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 775ad23c0..8d3b7c92b 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", "name": "CinnabarIsland_PokemonLab_Entrance", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 25d094aa2..d6856c1f1 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", "name": "CinnabarIsland_PokemonLab_ExperimentRoom", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 08fe9acb8..3232c824a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -255,7 +255,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor waitmessage waitfanfare @@ -270,7 +270,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E82 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor waitmessage waitfanfare diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 354bcfc2f..f51aa1fa8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", "name": "CinnabarIsland_PokemonLab_Lounge", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index df02316d7..a615b6830 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", "name": "CinnabarIsland_PokemonLab_ResearchRoom", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index 13cdfac0a..a95991fad 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_B1F", "name": "DiglettsCave_B1F", "layout": "LAYOUT_DIGLETTS_CAVE_B1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index f3bf00f42..5135b3e28 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", "name": "DiglettsCave_NorthEntrance", "layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 0c6fb74e9..493f30be7 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", "name": "DiglettsCave_SouthEntrance", "layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 413782a68..29e667d27 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND", "name": "FiveIsland", "layout": "LAYOUT_FIVE_ISLAND", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 04b5b134b..e86f2333a 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HARBOR", "name": "FiveIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 63c4e9c84..c4a14839d 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HOUSE1", "name": "FiveIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 872818a50..bd75ab0c3 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HOUSE2", "name": "FiveIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index b257237bd..d91c86b79 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", "name": "FiveIsland_LostCave_Entrance", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index be0c1a618..9d6e27c73 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", "name": "FiveIsland_LostCave_Room1", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 1ad0c8d76..20835f0bc 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", "name": "FiveIsland_LostCave_Room10", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index d8b4dbb62..ab63d2ea3 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", "name": "FiveIsland_LostCave_Room11", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index cfe11f2c0..c14996b6f 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", "name": "FiveIsland_LostCave_Room12", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 877ebe89a..84a0f34ea 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", "name": "FiveIsland_LostCave_Room13", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 20c960ff2..2d24d97c8 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", "name": "FiveIsland_LostCave_Room14", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index eaeabf81b..d1a5ff27d 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", "name": "FiveIsland_LostCave_Room2", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index bcd56fec5..97c46a1dd 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", "name": "FiveIsland_LostCave_Room3", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 9789e22ac..93de2af9a 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", "name": "FiveIsland_LostCave_Room4", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index 94a33e0be..099d76722 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", "name": "FiveIsland_LostCave_Room5", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index 1941530d6..c96ab57f7 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", "name": "FiveIsland_LostCave_Room6", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index 459c54736..91f787589 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", "name": "FiveIsland_LostCave_Room7", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index d0c0c0d87..243b3fed6 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", "name": "FiveIsland_LostCave_Room8", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index 1669d671e..b2bb357d8 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", "name": "FiveIsland_LostCave_Room9", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index f88dfed92..16c52f2af 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_MEADOW", "name": "FiveIsland_Meadow", "layout": "LAYOUT_FIVE_ISLAND_MEADOW", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 21e92146d..489f63372 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR", "name": "FiveIsland_MemorialPillar", "layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_MEMORIAL_PILLAR", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index edc012fb7..24c72dd7e 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", "name": "FiveIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 7564186ad..bb3bdd1eb 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", "name": "FiveIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 77bb5125c..5c596b3bc 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", "name": "FiveIsland_ResortGorgeous", "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 05178a289..d361589b7 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", "name": "FiveIsland_ResortGorgeous_House", "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index c5863a524..e14361861 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", "name": "FiveIsland_RocketWarehouse", "layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 33c06d199..002a02f36 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_WATER_LABYRINTH", "name": "FiveIsland_WaterLabyrinth", "layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_WATER_LABYRINTH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index b07235406..d7815af0c 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -34,7 +34,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan waitfanfare waitmessage diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 1c0b06c83..33abf1091 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND", "name": "FourIsland", "layout": "LAYOUT_FOUR_ISLAND", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index ac670db55..8fbf028fc 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -32,7 +32,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_RIVAL, Movement_Delay48 @@ -46,7 +46,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit waitmovement 0 fadedefaultbgm - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 @@ -113,7 +113,7 @@ FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB textcolor 3 message DayCare_Text_ReceivedEgg call EventScript_RestorePrevTextColor - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress msgbox DayCare_Text_TakeGoodCareOfIt diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index c324696cc..afa0aca6c 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HARBOR", "name": "FourIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 7016ab9ab..44bf35f30 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HOUSE1", "name": "FourIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index af7a3322d..d31d74e77 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HOUSE2", "name": "FourIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 8e7f52c9e..d8ddd44d1 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", "name": "FourIsland_IcefallCave_1F", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index be73f02fc..797c05d6b 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -21,7 +21,7 @@ FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65 delay 20 applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F waitstate diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 02db224cb..8e5bdb8bf 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", "name": "FourIsland_IcefallCave_B1F", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index a9d838841..bbb4afb7c 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", "name": "FourIsland_IcefallCave_Back", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index a0a94d4be..3edbc3886 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -47,7 +47,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98 waitmovement 0 applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 textcolor 0 msgbox FourIsland_IcefallCave_Back_Text_GruntIntro setvar VAR_LAST_TALKED, LOCALID_ROCKET3 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index 0dfe89452..aa97ac246 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", "name": "FourIsland_IcefallCave_Entrance", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 77eb60ff2..72070ccbf 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", "name": "FourIsland_LoreleisHouse", "layout": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 178b8b4bf..ab36dfb24 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_MART", "name": "FourIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index e87c2955b..89ddda178 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", "name": "FourIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 5191528a8..7d6092bea 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", "name": "FourIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 3cfb9dc54..81c7c0d9d 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", "name": "FourIsland_PokemonDayCare", "layout": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index dc04c477f..d09dc5369 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -132,7 +132,7 @@ FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05 waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 - playse SE_REGI + playse SE_RS_SHOP msgbox DayCare_Text_HeresYourMon waitse playmoncry VAR_RESULT, 0 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index aab3609d4..4fbe92321 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY", "name": "FuchsiaCity", "layout": "LAYOUT_FUCHSIA_CITY", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FuchsiaCity_Gym/text.inc b/data/maps/FuchsiaCity_Gym/text.inc index 2bfe9e53f..4b3314e0e 100644 --- a/data/maps/FuchsiaCity_Gym/text.inc +++ b/data/maps/FuchsiaCity_Gym/text.inc @@ -9,7 +9,7 @@ FuchsiaCity_Gym_Text_KogaIntro:: @ 819832E .string "Poison brings steady doom.\n" .string "Sleep renders foes helpless.\p" .string "Despair to the creeping horror of\n" - .string "POISON-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" + .string "POISON-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" FuchsiaCity_Gym_Text_KogaDefeat:: @ 8198444 .string "Humph!\n" diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 68f802b88..ac9fbd673 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE1", "name": "FuchsiaCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 25361a07d..9d66853a4 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE2", "name": "FuchsiaCity_House2", "layout": "LAYOUT_FUCHSIA_CITY_HOUSE2", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index fde85e8f9..b6916bec8 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE3", "name": "FuchsiaCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index d392f0aaf..d3d027c2c 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -37,7 +37,7 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0 FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919 special MoveDeleterForgetMove - playfanfare MUS_ME_WASURE + playfanfare MUS_MOVE_DELETED waitfanfare msgbox FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely release diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index d7ac2c49d..10e7deb5a 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_MART", "name": "FuchsiaCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index b97fbb232..04e1112cd 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", "name": "FuchsiaCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 588d1a3eb..16e7f5606 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", "name": "FuchsiaCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 85b2d38e7..62161f69f 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", "name": "FuchsiaCity_SafariZone_Entrance", "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 5b0f06b08..459c9c76b 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -120,7 +120,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA updatemoneybox 0, 0, 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls waitfanfare call EventScript_RestorePrevTextColor diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index 77704acae..89bf9cffc 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE", "name": "FuchsiaCity_SafariZone_Office", "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index ceb1d7398..73a8ee885 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_WARDENS_HOUSE", "name": "FuchsiaCity_WardensHouse", "layout": "LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_WardensHouse/scripts.inc b/data/maps/FuchsiaCity_WardensHouse/scripts.inc index 1f0c891d6..7f1df4e44 100644 --- a/data/maps/FuchsiaCity_WardensHouse/scripts.inc +++ b/data/maps/FuchsiaCity_WardensHouse/scripts.inc @@ -16,7 +16,7 @@ FuchsiaCity_WardensHouse_EventScript_Warden:: @ 816D74C FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden waitmessage waitfanfare diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index be976f4ae..31461c51f 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_EXTERIOR", "name": "IndigoPlateau_Exterior", "layout": "LAYOUT_INDIGO_PLATEAU_EXTERIOR", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index ecea7899a..e54d60e0d 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -13,7 +13,7 @@ IndigoPlateau_Exterior_OnTransition:: @ 8167246 end IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: @ 8167255 - playbgm MUS_ENDING, 0 + playbgm MUS_CREDITS, 0 return IndigoPlateau_Exterior_OnFrame:: @ 816725A diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 8181715b0..bdb442d7a 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", "name": "IndigoPlateau_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 6f9bd7a0b..07fe80598 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN", "name": "LavenderTown", "layout": "LAYOUT_LAVENDER_TOWN", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index ae6263789..2920d0f11 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_HOUSE1", "name": "LavenderTown_House1", "layout": "LAYOUT_HOUSE5", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 565db668d..51f227c93 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_HOUSE2", "name": "LavenderTown_House2", "layout": "LAYOUT_HOUSE5", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 5cb531347..c855026dc 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_MART", "name": "LavenderTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 4af67cd2a..f418ed011 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", "name": "LavenderTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index da2a5786a..108d34364 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", "name": "LavenderTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 07ac2badd..02b70d9ef 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", "name": "LavenderTown_VolunteerPokemonHouse", "layout": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 703a71296..29972d993 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -10,7 +10,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji:: @ 816B14A compare VAR_RESULT, FALSE goto_if_eq LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute setflag FLAG_GOT_POKE_FLUTE - giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_FAN5 + giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_OBTAIN_KEY_ITEM msgbox LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute release end diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 6b0c1a8fb..42e1ea87f 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_EXTERIOR", "name": "MtEmber_Exterior", "layout": "LAYOUT_MT_EMBER_EXTERIOR", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 7d67eea09..36d82ca18 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -40,7 +40,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated:: @ 816399E MtEmber_Exterior_EventScript_BattleGrunt1:: @ 81639A8 applymovement 2, Movement_FacePlayer waitmovement 0 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt1Intro trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_Text_Grunt1Defeat msgbox MtEmber_Exterior_Text_Grunt1PostBattle @@ -77,7 +77,7 @@ MtEmber_Exterior_EventScript_DefeatedGrunt2:: @ 8163A1B end MtEmber_Exterior_EventScript_BattleGrunt2:: @ 8163A25 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt2Intro trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_Text_Grunt2Defeat msgbox MtEmber_Exterior_Text_Grunt2PostBattle diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 46da66957..3a3d01a84 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_1F", "name": "MtEmber_RubyPath_1F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index af102d21a..131ba8fd6 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B1F", "name": "MtEmber_RubyPath_B1F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 426dfd840..ea9fa2586 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", "name": "MtEmber_RubyPath_B1F_Stairs", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index ae9032e1a..aaf1b8dc3 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B2F", "name": "MtEmber_RubyPath_B2F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 5aff19b08..b9c4074f9 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", "name": "MtEmber_RubyPath_B2F_Stairs", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 80a475e31..7ee35c5ef 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B3F", "name": "MtEmber_RubyPath_B3F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 3c6852535..a031e598b 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -7,6 +7,6 @@ MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49 faceplayer setflag FLAG_GOT_RUBY removeobject 1 - giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_FAN5 + giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 5d4da8a7a..d4ed67e9c 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B4F", "name": "MtEmber_RubyPath_B4F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 8ca8f26f7..267cedd37 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B5F", "name": "MtEmber_RubyPath_B5F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 521adf657..e750d9d65 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT", "name": "MtEmber_Summit", "layout": "LAYOUT_MT_EMBER_SUMMIT", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index f34e9ff6f..f0dc178bb 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -34,7 +34,7 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33 waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 77c89d7f2..2f577dc02 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_1F", "name": "MtEmber_SummitPath_1F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index ee43d3bce..0cc16016d 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_2F", "name": "MtEmber_SummitPath_2F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index 330bc6fe5..19dd584bc 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_3F", "name": "MtEmber_SummitPath_3F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 7a53c094a..4e91905de 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_1F", "name": "MtMoon_1F", "layout": "LAYOUT_MT_MOON_1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index e330d5510..68723ddee 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_B1F", "name": "MtMoon_B1F", "layout": "LAYOUT_MT_MOON_B1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 172a1be21..358d791b8 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_B2F", "name": "MtMoon_B2F", "layout": "LAYOUT_MT_MOON_B2F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 9bfe16f79..4ea99eb24 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -36,7 +36,7 @@ MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD textcolor 0 message MtMoon_B2F_Text_MiguelIntro waitmessage - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setvar VAR_LAST_TALKED, LOCALID_MIGUEL trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_Text_MiguelDefeat @@ -61,7 +61,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B compare VAR_RESULT, NO goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil removeobject LOCALID_DOME_FOSSIL - giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_OBTAIN_KEY_ITEM closemessage special QuestLog_CutRecording delay 10 @@ -69,7 +69,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B waitmovement 0 moveobjectoffscreen LOCALID_MIGUEL textcolor 0 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare @@ -93,7 +93,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F compare VAR_RESULT, NO goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil removeobject LOCALID_HELIX_FOSSIL - giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_OBTAIN_KEY_ITEM closemessage special QuestLog_CutRecording delay 10 @@ -101,7 +101,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F waitmovement 0 moveobjectoffscreen LOCALID_MIGUEL textcolor 0 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index 703240141..1cee54ae8 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_1F", "name": "NavelRock_1F", "layout": "LAYOUT_NAVEL_ROCK_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index b1a6deada..8ebd55017 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_B1F", "name": "NavelRock_B1F", "layout": "LAYOUT_NAVEL_ROCK_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 8c00f2a75..6350185f9 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE", "name": "NavelRock_Base", "layout": "LAYOUT_NAVEL_ROCK_BASE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 9308f1ee1..09cea7949 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -35,14 +35,14 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134 faceplayer waitse delay 20 - playse SE_T_AME_E + playse SE_THUNDERSTORM_STOP setvar VAR_0x8004, 0 @ Vertical pan setvar VAR_0x8005, 3 @ Horizontal pan setvar VAR_0x8006, 4 @ Num shakes setvar VAR_0x8007, 2 @ Shake delay special ShakeScreen delay 30 - playse SE_T_AME_E + playse SE_THUNDERSTORM_STOP setvar VAR_0x8004, 0 @ Vertical pan setvar VAR_0x8005, 3 @ Horizontal pan setvar VAR_0x8006, 4 @ Num shakes diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index 716ae04db..c579af031 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B10F", "name": "NavelRock_BasePath_B10F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 1b92ca1fc..579b13577 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B11F", "name": "NavelRock_BasePath_B11F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index 624f800ee..f0289d880 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B1F", "name": "NavelRock_BasePath_B1F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index b6af50439..5cd175db3 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B2F", "name": "NavelRock_BasePath_B2F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index 22cc90c60..fdbe8f4e3 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B3F", "name": "NavelRock_BasePath_B3F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index 33c4d41be..e90cabc93 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B4F", "name": "NavelRock_BasePath_B4F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 26cf212c6..61737e2e6 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B5F", "name": "NavelRock_BasePath_B5F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index 0d3ffdf8f..54801807e 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B6F", "name": "NavelRock_BasePath_B6F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index acfc1da43..b64c7ae1c 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B7F", "name": "NavelRock_BasePath_B7F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 4756a0655..5a50563b7 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B8F", "name": "NavelRock_BasePath_B8F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index d033dd887..a14c35048 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B9F", "name": "NavelRock_BasePath_B9F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index 9b10f6d8c..e7578b073 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_EXTERIOR", "name": "NavelRock_Exterior", "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index ec9fec5df..25e7ecf40 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_FORK", "name": "NavelRock_Fork", "layout": "LAYOUT_NAVEL_ROCK_FORK", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 3b859459e..a94603087 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_HARBOR", "name": "NavelRock_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index a7bacb9f5..2718158b2 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT", "name": "NavelRock_Summit", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index d103d5f70..9a61e4b79 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", "name": "NavelRock_SummitPath_2F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 3a122a2d2..e61f23fb8 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", "name": "NavelRock_SummitPath_3F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index fa74a2c92..3d55fb5d7 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", "name": "NavelRock_SummitPath_4F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 25d3ba773..0182b2eec 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", "name": "NavelRock_SummitPath_5F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 394af5a6d..e49ef37ef 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND", "name": "OneIsland", "layout": "LAYOUT_ONE_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index f44aaa144..0ca6c7b3f 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HARBOR", "name": "OneIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index c6fa1d06f..5823a4c3c 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HOUSE1", "name": "OneIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index da306f19e..3f51fb461 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HOUSE2", "name": "OneIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index c22c95e05..963d70acc 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_KINDLE_ROAD", "name": "OneIsland_KindleRoad", "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_KINDLE_ROAD", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index d7fa5d88f..f31b4b26f 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", "name": "OneIsland_KindleRoad_EmberSpa", "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_EMBER_SPA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index e3d94753a..1223e5a2d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", "name": "OneIsland_PokemonCenter_1F", "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F", - "music": "MUS_NETWORK", + "music": "MUS_NET_CENTER", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 524c99272..1d46a2bf8 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -104,12 +104,12 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer - msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_FAN5 + msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM additem ITEM_METEORITE applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis - giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_FAN5 + giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage @@ -137,7 +137,7 @@ OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp:: @ 8170E3D OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap waitmessage waitfanfare @@ -147,7 +147,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM return OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: @ 8170E7D @@ -260,7 +260,7 @@ OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire:: @ 8170F9B OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio waitmessage waitfanfare @@ -270,7 +270,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 closemessage applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 - playse SE_TK_KASYA + playse SE_CLICK call OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile special DrawWholeMapView msgbox OneIsland_PokemonCenter_1F_Text_OkayThisIsGood @@ -306,7 +306,7 @@ OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass:: @ 817103A OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 msgbox OneIsland_PokemonCenter_1F_Text_OhThats textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio waitmessage waitfanfare @@ -314,7 +314,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 closemessage applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 - playse SE_TK_KASYA + playse SE_CLICK call OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile special DrawWholeMapView delay 30 @@ -341,11 +341,11 @@ OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2 additem ITEM_RAINBOW_PASS setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass waitmessage waitfanfare - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage waitmessage waitfanfare @@ -501,7 +501,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: @ 81711DA applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 clearflag FLAG_HIDE_CINNABAR_BILL diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 13d3d1d02..f7fd1a1bb 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", "name": "OneIsland_PokemonCenter_2F", "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F", - "music": "MUS_NETWORK", + "music": "MUS_NET_CENTER", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 2f96d4b26..1eaf448bc 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_TREASURE_BEACH", "name": "OneIsland_TreasureBeach", "layout": "LAYOUT_ONE_ISLAND_TREASURE_BEACH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_TREASURE_BEACH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 8ebfb8bcc..91819b8b1 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN", "name": "PalletTown", "layout": "LAYOUT_PALLET_TOWN", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 62e9d8a01..bed477a5c 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -65,7 +65,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8 goto_if_lt PalletTown_EventScript_NotEnoughMonsForNationalDex msgbox PalletTown_Text_CaughtXImpressiveFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse waitmovement 0 @@ -189,7 +189,7 @@ PalletTown_EventScript_OakTrigger:: @ 8165605 famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 textcolor 0 delay 30 - playbgm MUS_OHKIDO, 0 + playbgm MUS_OAK, 0 message PalletTown_Text_OakDontGoOut waitmessage delay 85 diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 0808e9534..b59a5fc0f 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_GARYS_HOUSE", "name": "PalletTown_GarysHouse", "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index b9ce39e52..e61904c71 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -69,7 +69,7 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime closemessage fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special DaisyMassageServices fadescreen FADE_FROM_BLACK @@ -155,7 +155,7 @@ PalletTown_GarysHouse_EventScript_GiveTownMap:: @ 8168EF6 applymovement LOCALID_DAISY, Movement_FacePlayer waitmovement 0 delay 12 - giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 60d0d1960..f40f63125 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", "name": "PalletTown_PlayersHouse_1F", "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index bd2aec42f..9d38997a1 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", "name": "PalletTown_PlayersHouse_2F", "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index ad076b0c6..4ba6d636b 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", "name": "PalletTown_ProfessorOaksLab", "layout": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "music": "MUS_KENKYU", + "music": "MUS_OAK_LAB", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index c21a0e184..43000bc34 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -41,7 +41,7 @@ PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: @ 8168FC0 PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: @ 8168FC6 setobjectxyperm LOCALID_PROF_OAK, 6, 11 setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP - savebgm MUS_OHKIDO + savebgm MUS_OAK return PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: @ 8168FD5 @@ -124,7 +124,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 compare VAR_FACING, DIR_WEST call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded waitmessage waitfanfare @@ -133,7 +133,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_FACING, DIR_NORTH call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH @@ -151,7 +151,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169174 setobjectxyperm LOCALID_RIVAL, 5, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -160,7 +160,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8169194 setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter @@ -170,7 +170,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: @ 81691BB setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -239,7 +239,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp waitmovement 0 clearflag FLAG_DONT_TRANSITION_MUSIC - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting closemessage @@ -316,7 +316,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: @ 81692FF PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: @ 816930B textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp @@ -509,7 +509,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 special HealPlayerParty msgbox PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_2, 1 call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft compare VAR_TEMP_2, 2 @@ -517,7 +517,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 compare VAR_TEMP_2, 3 call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight removeobject LOCALID_RIVAL - playse SE_KAIDAN + playse SE_EXIT fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 setflag FLAG_BEAT_RIVAL_IN_OAKS_LAB @@ -651,14 +651,14 @@ PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow:: @ 8169614 PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E msgbox PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel waitmessage waitfanfare call EventScript_RestorePrevTextColor removeitem ITEM_OAKS_PARCEL, 1 msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalGramps closemessage compare VAR_FACING, DIR_NORTH @@ -717,7 +717,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest delay 10 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak waitmessage waitfanfare @@ -741,7 +741,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest msgbox PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_FACING, DIR_NORTH call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH @@ -1220,7 +1220,7 @@ PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74 getspeciesname 0, PLAYER_STARTER_SPECIES message PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak waitmessage - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, YES @@ -1271,7 +1271,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F getspeciesname 0, RIVAL_STARTER_SPECIES message PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak waitmessage - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 call_if_set FLAG_OPENED_START_MENU, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 6d6fc0396..eca9af0b8 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY", "name": "PewterCity", "layout": "LAYOUT_PEWTER_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 5bb795169..2d0320b10 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -18,7 +18,7 @@ PewterCity_EventScript_GymGuide:: @ 8165B9D faceplayer msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_FACING, DIR_EAST call_if_eq PewterCity_EventScript_WalkToGymEast msgbox PewterCity_Text_GoTakeOnBrock @@ -287,7 +287,7 @@ PewterCity_EventScript_GymGuideTrigger:: @ 8165DBE textcolor 0 msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_TEMP_1, 0 call_if_eq PewterCity_EventScript_WalkToGymTop compare VAR_TEMP_1, 1 @@ -445,7 +445,7 @@ PewterCity_EventScript_MuseumGuide:: @ 816607E msgbox PewterCity_Text_ReallyYouHaveToGo closemessage delay 10 - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_FACING, DIR_NORTH call_if_eq PewterCity_EventScript_LeadToMuseumNorth compare VAR_FACING, DIR_SOUTH @@ -719,7 +719,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE call_if_eq PewterCity_EventScript_AideApproachPlayer3 msgbox PewterCity_Text_AskedToDeliverThis textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PewterCity_Text_ReceivedRunningShoesFromAide waitmessage waitfanfare diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc index c47a60b05..b6a1d87ee 100644 --- a/data/maps/PewterCity_Gym/text.inc +++ b/data/maps/PewterCity_Gym/text.inc @@ -12,7 +12,7 @@ PewterCity_Gym_Text_BrockIntro:: @ 8190CD4 .string "That's the TRAINER's honor that\n" .string "compels you to challenge me.\p" .string "Fine, then!\n" - .string "Show me your best!{PLAY_BGM}{MUS_EXEYE}$" + .string "Show me your best!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F .string "I took you for granted, and so\n" @@ -21,7 +21,7 @@ PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F .string "on you this…the official POKéMON\l" .string "LEAGUE BOULDERBADGE.\p" .string "{SIZE}Á{PLAYER} received the BOULDERBADGE\n" - .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" + .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" .string "{SIZE}ÇJust having the BOULDERBADGE makes\n" .string "your POKéMON more powerful.\p" .string "It also enables the use of the\n" diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 1c45b8da0..70b274917 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_HOUSE1", "name": "PewterCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index cb65aa873..224bf438e 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_HOUSE2", "name": "PewterCity_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index ec45af3a6..df4620ff7 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MART", "name": "PewterCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 26cdfbdcd..a96ec184e 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MUSEUM_1F", "name": "PewterCity_Museum_1F", "layout": "LAYOUT_PEWTER_CITY_MUSEUM_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 6a3601717..1b481d392 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -159,7 +159,7 @@ PewterCity_Museum_1F_EventScript_OldAmberScientist:: @ 816A4AE goto_if_eq PewterCity_Museum_1F_EventScript_NoRoomForOldAmber setflag FLAG_GOT_OLD_AMBER removeobject 4 - giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_FAN5 + giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 2e3c40177..95c1b6aa4 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MUSEUM_2F", "name": "PewterCity_Museum_2F", "layout": "LAYOUT_PEWTER_CITY_MUSEUM_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 6918c6df2..ebc6c532b 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", "name": "PewterCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 5ec0e0cd9..8cd8c3415 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -22,11 +22,11 @@ PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 lock faceplayer fadeoutbgm 0 - playbgm MUS_PURIN, 0 + playbgm MUS_JIGGLYPUFF, 0 message PewterCity_Museum_1F_Text_Jigglypuff waitmessage delay 455 - playbgm MUS_POKECEN, 1 + playbgm MUS_POKE_CENTER, 1 release end diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index d080b6965..45d753045 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", "name": "PewterCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 87f9eb0a7..86fda6a3e 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", "name": "PokemonLeague_AgathasRoom", "layout": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc index 06a8af142..dc1923238 100644 --- a/data/maps/PokemonLeague_AgathasRoom/text.inc +++ b/data/maps/PokemonLeague_AgathasRoom/text.inc @@ -11,7 +11,7 @@ PokemonLeague_AgathasRoom_Text_Intro:: @ 817844D .string "He's wrong.\n" .string "POKéMON are for battling!\p" .string "{PLAYER}! I'll show you how a real\n" - .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" + .string "TRAINER battles!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D .string "I am AGATHA of the ELITE FOUR.\p" @@ -26,7 +26,7 @@ PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D .string "He's wrong.\n" .string "POKéMON are for battling!\p" .string "{PLAYER}! I'll show you how a real\n" - .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" + .string "TRAINER battles!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_AgathasRoom_Text_Defeat:: @ 81786D7 .string "Oh, my!\n" diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index bcc6a1155..cf1448886 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", "name": "PokemonLeague_BrunosRoom", "layout": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc index 4c6cb4561..a9a7ef5e1 100644 --- a/data/maps/PokemonLeague_BrunosRoom/text.inc +++ b/data/maps/PokemonLeague_BrunosRoom/text.inc @@ -9,7 +9,7 @@ PokemonLeague_BrunosRoom_Text_Intro:: @ 817820F .string "{PLAYER}!\p" .string "We will grind you down with our\n" .string "superior power!\p" - .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" + .string "Hoo hah!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C .string "I am BRUNO of the ELITE FOUR!\p" @@ -22,7 +22,7 @@ PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C .string "{PLAYER}!\p" .string "We will grind you down with our\n" .string "superior power!\p" - .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" + .string "Hoo hah!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_BrunosRoom_Text_Defeat:: @ 8178409 .string "Why?\n" diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index a0480dbd5..a4c1da00f 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", "name": "PokemonLeague_ChampionsRoom", "layout": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 817991d5a..84879db66 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -61,7 +61,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 goto_if_questlog PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - savebgm MUS_WIN_GYM + savebgm MUS_VICTORY_GYM_LEADER call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Battle call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Rematch setflag FLAG_TEMP_4 @@ -69,7 +69,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 setflag FLAG_DEFEATED_CHAMP setflag FLAG_TEMP_4 msgbox PokemonLeague_ChampionsRoom_Text_PostBattle - playbgm MUS_SLOWMASARA, 0 + playbgm MUS_SLOW_PALLET, 0 addobject LOCALID_PROF_OAK msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer closemessage diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 1b694e4fb..bbe302813 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", "name": "PokemonLeague_HallOfFame", "layout": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME", - "music": "MUS_SLOWMASARA", + "music": "MUS_SLOW_PALLET", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index c112adb23..05c1daa01 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_LANCES_ROOM", "name": "PokemonLeague_LancesRoom", "layout": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 190e52d33..65afbdcb4 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -42,7 +42,7 @@ PokemonLeague_LancesRoom_EventScript_EnterRoom:: @ 8162987 waitmovement 0 setflag FLAG_TEMP_2 call PokemonLeague_LancesRoom_EventScript_SetEntryClosed - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 4 diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc index 8c726875a..cef8c7712 100644 --- a/data/maps/PokemonLeague_LancesRoom/text.inc +++ b/data/maps/PokemonLeague_LancesRoom/text.inc @@ -12,7 +12,7 @@ PokemonLeague_LancesRoom_Text_Intro:: @ 8178764 .string "There's no being clever with them.\p" .string "Well, are you ready to lose?\p" .string "Your LEAGUE challenge ends with\n" - .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" + .string "me, {PLAYER}!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD .string "Ah!\n" @@ -28,7 +28,7 @@ PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD .string "There's no being clever with them.\p" .string "Well, are you ready to lose?\p" .string "Your LEAGUE challenge ends with\n" - .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" + .string "me, {PLAYER}!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LancesRoom_Text_Defeat:: @ 8178A15 .string "That's it!\p" diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc index 55e67d764..be9ff69e2 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/text.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc @@ -7,7 +7,7 @@ PokemonLeague_LoreleisRoom_Text_Intro:: @ 8177FA4 .string "Your POKéMON will be at my mercy\n" .string "when they are frozen solid.\p" .string "Hahaha!\n" - .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" + .string "Are you ready?{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 .string "Welcome to the POKéMON LEAGUE.\p" @@ -20,7 +20,7 @@ PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 .string "Your POKéMON will be at my mercy\n" .string "when they are frozen solid.\p" .string "Hahaha!\n" - .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" + .string "Are you ready?{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LoreleisRoom_Text_Defeat:: @ 8178191 .string "…Things shouldn't be this way!$" diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 1cbf97e80..d8ff775b8 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_1F", "name": "PokemonMansion_1F", "layout": "LAYOUT_POKEMON_MANSION_1F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index cc071a6ac..38b41d545 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -15,7 +15,7 @@ PokemonMansion_1F_EventScript_Statue:: @ 8162212 lockall setvar VAR_0x8004, 0 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 2591840bc..6fb09a8e7 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_2F", "name": "PokemonMansion_2F", "layout": "LAYOUT_POKEMON_MANSION_2F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index a6dd709a7..9a33853b4 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_2F_EventScript_Statue:: @ 8162264 lockall setvar VAR_0x8004, 1 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 6437b86b2..6ca394a7d 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_3F", "name": "PokemonMansion_3F", "layout": "LAYOUT_POKEMON_MANSION_3F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index dd7667161..71ba27874 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_3F_EventScript_Statue:: @ 81622B1 lockall setvar VAR_0x8004, 2 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 32595b885..4f4ad6ea1 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_B1F", "name": "PokemonMansion_B1F", "layout": "LAYOUT_POKEMON_MANSION_B1F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 5f749fc24..c522096e1 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_B1F_EventScript_Statue:: @ 816230C lockall setvar VAR_0x8004, 3 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index fd5d75c8b..b0d8cafa2 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_1F", "name": "PokemonTower_1F", "layout": "LAYOUT_POKEMON_TOWER_1F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 527af409c..36281aa79 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_2F", "name": "PokemonTower_2F", "layout": "LAYOUT_POKEMON_TOWER_2F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 0042290c1..20cbe6090 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -19,7 +19,7 @@ PokemonTower_2F_EventScript_RivalTriggerDown:: @ 816329B PokemonTower_2F_EventScript_Rival:: @ 81632A7 textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 compare VAR_TEMP_1, 0 call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight compare VAR_TEMP_1, 1 @@ -38,12 +38,12 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 call_if_eq PokemonTower_2F_EventScript_RivalCharmander msgbox PokemonTower_2F_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq PokemonTower_2F_EventScript_RivalExitRight compare VAR_TEMP_1, 1 call_if_eq PokemonTower_2F_EventScript_RivalExitDown - playse SE_KAIDAN + playse SE_EXIT delay 25 fadedefaultbgm removeobject 1 diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index af3480839..ee15b4a68 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_3F", "name": "PokemonTower_3F", "layout": "LAYOUT_POKEMON_TOWER_3F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index d7104bc15..7924b4f3c 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_4F", "name": "PokemonTower_4F", "layout": "LAYOUT_POKEMON_TOWER_4F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index bd22d3bff..9f74a6aab 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_5F", "name": "PokemonTower_5F", "layout": "LAYOUT_POKEMON_TOWER_5F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index a9bd74228..ae72e35e6 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_6F", "name": "PokemonTower_6F", "layout": "LAYOUT_POKEMON_TOWER_6F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index deaaab14d..327b9311b 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_7F", "name": "PokemonTower_7F", "layout": "LAYOUT_POKEMON_TOWER_7F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 7b0d5f37a..12f69cedf 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -50,7 +50,7 @@ PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0 PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600 applymovement 2, PokemonTower_7F_Movement_Grunt1ExitLeft waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT delay 25 goto PokemonTower_7F_EventScript_RemoveGrunt1 end diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 3e92c9ebc..f019d6320 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -2,7 +2,7 @@ "id": "MAP_POWER_PLANT", "name": "PowerPlant", "layout": "LAYOUT_POWER_PLANT", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index ad6d3fe6a..1cbd06d48 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -45,7 +45,7 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8 waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json index 761c204ce..8f83fc5da 100644 --- a/data/maps/Prototype_SeviiIsle_6/map.json +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_6", "name": "Prototype_SeviiIsle_6", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json index 856883c02..d7260198e 100644 --- a/data/maps/Prototype_SeviiIsle_7/map.json +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_7", "name": "Prototype_SeviiIsle_7", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json index dd05d6d35..758aaf8d8 100644 --- a/data/maps/Prototype_SeviiIsle_8/map.json +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_8", "name": "Prototype_SeviiIsle_8", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json index b03f3866c..22ab85069 100644 --- a/data/maps/Prototype_SeviiIsle_9/map.json +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_9", "name": "Prototype_SeviiIsle_9", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index ad4308513..710a91832 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_RECORD_CENTER", "name": "RecordCenter", "layout": "LAYOUT_RECORD_CENTER", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index b248fccdb..2c0ae4315 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCK_TUNNEL_1F", "name": "RockTunnel_1F", "layout": "LAYOUT_ROCK_TUNNEL_1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index c1b86c78f..186cd6336 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCK_TUNNEL_B1F", "name": "RockTunnel_B1F", "layout": "LAYOUT_ROCK_TUNNEL_B1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 47c8f7b08..54cf4bdef 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B1F", "name": "RocketHideout_B1F", "layout": "LAYOUT_ROCKET_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 6149ac0c2..efc2c17a2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -38,7 +38,7 @@ RocketHideout_B1F_EventScript_Grunt5:: @ 816120A RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225 call RocketHideout_B1F_EventScript_RemoveBarrier - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse release diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 88d13e88a..9cdb75e2a 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B2F", "name": "RocketHideout_B2F", "layout": "LAYOUT_ROCKET_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 0127e1f5d..5ab261edf 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B3F", "name": "RocketHideout_B3F", "layout": "LAYOUT_ROCKET_HIDEOUT_B3F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index cce2d5ebf..0e55fb111 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B4F", "name": "RocketHideout_B4F", "layout": "LAYOUT_ROCKET_HIDEOUT_B4F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 5919b342f..820325485 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -26,7 +26,7 @@ RocketHideout_B4F_EventScript_Giovanni:: @ 8161317 famechecker FAMECHECKER_GIOVANNI, 0 message RocketHideout_B4F_Text_GiovanniIntro waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, RocketHideout_B4F_Text_GiovanniDefeat msgbox RocketHideout_B4F_Text_GiovanniPostBattle @@ -108,7 +108,7 @@ RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433 end RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462 - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse return diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 746d61db2..71a762a19 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_ELEVATOR", "name": "RocketHideout_Elevator", "layout": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index e0d5f8b73..96878b73b 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE1", "name": "Route1", "layout": "LAYOUT_ROUTE1", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_ROUTE_1", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index aaea71eaf..8004f3626 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -11,7 +11,7 @@ Route1_EventScript_MartClerk:: @ 8167EFE compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull getitemname 1, ITEM_POTION - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_ObtainedTheX waitmessage waitfanfare diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 748ec3d2a..9c82434fb 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10", "name": "Route10", "layout": "LAYOUT_ROUTE10", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index dc4978cc6..b8c0aa7ed 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10_POKEMON_CENTER_1F", "name": "Route10_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 33dcdb91b..665f25678 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10_POKEMON_CENTER_2F", "name": "Route10_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 37d3efa5d..c948dcfc4 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11", "name": "Route11", "layout": "LAYOUT_ROUTE11", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index e404237d0..4063642d2 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11_EAST_ENTRANCE_1F", "name": "Route11_EastEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index e085ea030..ae37f03ea 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11_EAST_ENTRANCE_2F", "name": "Route11_EastEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index fefbe4f9c..49f08179c 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12", "name": "Route12", "layout": "LAYOUT_ROUTE12", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index a2546ccc6..1ae854e05 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_FISHING_HOUSE", "name": "Route12_FishingHouse", "layout": "LAYOUT_HOUSE4", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index a5314bb34..552880a86 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_NORTH_ENTRANCE_1F", "name": "Route12_NorthEntrance_1F", "layout": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 95dc0469c..192b2f407 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_NORTH_ENTRANCE_2F", "name": "Route12_NorthEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 01c83ca04..d22b8fe8b 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE13", "name": "Route13", "layout": "LAYOUT_ROUTE13", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_13", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 2f6d7cd79..212b190b0 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE14", "name": "Route14", "layout": "LAYOUT_ROUTE14", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_14", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index fee9bd531..df6d62329 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15", "name": "Route15", "layout": "LAYOUT_ROUTE15", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index a48784931..1317b92f8 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15_WEST_ENTRANCE_1F", "name": "Route15_WestEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index f91635160..1bba0494e 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15_WEST_ENTRANCE_2F", "name": "Route15_WestEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 8cc2f36e2..3b63483b2 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16", "name": "Route16", "layout": "LAYOUT_ROUTE16", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 875a14cef..f8bd335b3 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_HOUSE", "name": "Route16_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 2eb8919d0..d79f1d50b 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_NORTH_ENTRANCE_1F", "name": "Route16_NorthEntrance_1F", "layout": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 00562e86d..bf37d4ab4 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_NORTH_ENTRANCE_2F", "name": "Route16_NorthEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 3af5c7379..7218a151b 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE17", "name": "Route17", "layout": "LAYOUT_ROUTE17", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_17", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 339e931b5..28e35b7a3 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18", "name": "Route18", "layout": "LAYOUT_ROUTE18", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 370a52737..0cd6eaa19 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18_EAST_ENTRANCE_1F", "name": "Route18_EastEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 04642eddf..80b9973f6 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18_EAST_ENTRANCE_2F", "name": "Route18_EastEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index fbd12ad37..5fc1f6821 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE19", "name": "Route19", "layout": "LAYOUT_ROUTE19", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 6f9ae1327..6ad6a8e57 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2", "name": "Route2", "layout": "LAYOUT_ROUTE2", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index cb92a2361..0f606647d 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE20", "name": "Route20", "layout": "LAYOUT_ROUTE20", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_20", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index b651f0c16..33d256f6e 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE21_NORTH", "name": "Route21_North", "layout": "LAYOUT_ROUTE21_NORTH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 21cf0b51b..f5e648729 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE21_SOUTH", "name": "Route21_South", "layout": "LAYOUT_ROUTE21_SOUTH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 00ac3625a..a00677beb 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22", "name": "Route22", "layout": "LAYOUT_ROUTE22", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index dbc10e129..177269724 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -23,7 +23,7 @@ Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB Route22_EventScript_EarlyRival:: @ 81682BE textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_EarlyRivalApproach @@ -42,7 +42,7 @@ Route22_EventScript_EarlyRival:: @ 81682BE msgbox Route22_Text_EarlyRivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_EarlyRivalExit compare VAR_TEMP_1, 1 @@ -183,7 +183,7 @@ Route22_EventScript_LateRivalTriggerBottom:: @ 816840C Route22_EventScript_LateRival:: @ 816841F textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_LateRivalApproach @@ -202,7 +202,7 @@ Route22_EventScript_LateRival:: @ 816841F msgbox Route22_Text_LateRivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 applymovement 1, Route22_Movement_LateRivalExit waitmovement 0 fadedefaultbgm diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 23de05134..7367db717 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22_NORTH_ENTRANCE", "name": "Route22_NorthEntrance", "layout": "LAYOUT_ROUTE22_NORTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 3f2de59e9..01889aff9 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE23", "name": "Route23", "layout": "LAYOUT_ROUTE23", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 0cd897e8c..d3e00bab0 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE24", "name": "Route24", "layout": "LAYOUT_ROUTE24", - "music": "MUS_OPENING", + "music": "MUS_ROUTE24", "region_map_section": "MAPSEC_ROUTE_24", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 7a22f64e8..abaa43b47 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -58,7 +58,7 @@ Route24_EventScript_BattleRocket:: @ 81686B9 giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET message Route24_Text_JoinTeamRocket waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, LOCALID_ROCKET trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index c716acec5..8f93b33a7 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE25", "name": "Route25", "layout": "LAYOUT_ROUTE25", - "music": "MUS_OPENING", + "music": "MUS_ROUTE24", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 6a10da883..60a490867 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE25_SEA_COTTAGE", "name": "Route25_SeaCottage", "layout": "LAYOUT_ROUTE25_SEA_COTTAGE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 688cdc41d..517195dfb 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -64,7 +64,7 @@ Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillEnterTeleporter waitmovement 0 removeobject LOCALID_BILL_CLEFAIRY - playse SE_C_MAKU_D + playse SE_CONTEST_CURTAIN_FALL closedoor 10, 3 waitdooranim setflag BILL_IN_TELEPORTER @@ -113,7 +113,7 @@ Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A checkitemspace ITEM_SS_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket - giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_FAN5 + giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_OBTAIN_KEY_ITEM setflag FLAG_GOT_SS_TICKET_DUP setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_GOT_SS_TICKET @@ -188,7 +188,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE setvar VAR_0x8004, 1 special AnimateTeleporterHousing - playse SE_TK_WARPIN + playse SE_WARP_IN special AnimateTeleporterCable waitse call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE @@ -202,13 +202,13 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA addobject LOCALID_BILL_HUMAN clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE delay 50 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter waitmovement 0 waitfanfare applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters waitmovement 0 - playse SE_C_MAKU_D + playse SE_CONTEST_CURTAIN_FALL closedoor 3, 3 waitdooranim applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom @@ -218,7 +218,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA end Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: @ 81707B6 - playse SE_BOWA + playse SE_BALL waitse delay 20 return diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 20be5345d..f7997cb0b 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_EAST_BUILDING", "name": "Route2_EastBuilding", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 900ad5ba1..39c841dd3 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_HOUSE", "name": "Route2_House", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index dbd7c734a..c6cc23713 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", "name": "Route2_ViridianForest_NorthEntrance", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 2590d03f2..fbe4c75e0 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", "name": "Route2_ViridianForest_SouthEntrance", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 1051a4794..f310180b7 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE3", "name": "Route3", "layout": "LAYOUT_ROUTE3", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_3", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 2fa4ea4df..a588a2cd1 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4", "name": "Route4", "layout": "LAYOUT_ROUTE4", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 7b2f02a45..b62ee3fbe 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4_POKEMON_CENTER_1F", "name": "Route4_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 420e18d1a..d09fd1b3b 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -109,7 +109,7 @@ Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: @ 816F86A Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F removemoney MAGIKARP_PRICE, 0 updatemoneybox 0, 0, 0 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp waitmessage waitfanfare diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index b83288910..b70232abd 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4_POKEMON_CENTER_2F", "name": "Route4_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index a178efdc2..85b0e75a2 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5", "name": "Route5", "layout": "LAYOUT_ROUTE5", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 321f24a10..fa866f235 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5_POKEMON_DAY_CARE", "name": "Route5_PokemonDayCare", "layout": "LAYOUT_ROUTE5_POKEMON_DAY_CARE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 6562e44d3..9d40775e8 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5_SOUTH_ENTRANCE", "name": "Route5_SouthEntrance", "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 0b044b364..47c69f5c5 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE6", "name": "Route6", "layout": "LAYOUT_ROUTE6", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 3082859ec..287d13d1c 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE6_NORTH_ENTRANCE", "name": "Route6_NorthEntrance", "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 5a18cd689..922a44476 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE7", "name": "Route7", "layout": "LAYOUT_ROUTE7", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 2c990925b..b05ab81e7 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE7_EAST_ENTRANCE", "name": "Route7_EastEntrance", "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index e99df258f..7f0b2e8c4 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE8", "name": "Route8", "layout": "LAYOUT_ROUTE8", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 043b603c2..d759be75e 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE8_WEST_ENTRANCE", "name": "Route8_WestEntrance", "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 27e91cab7..b733f7a21 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE9", "name": "Route9", "layout": "LAYOUT_ROUTE9", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 5d4049473..fe30bc49f 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_CORRIDOR", "name": "SSAnne_1F_Corridor", "layout": "LAYOUT_SSANNE_1F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index a2e30ae70..47fa01a0c 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM1", "name": "SSAnne_1F_Room1", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 89b501da4..0f93495b2 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM2", "name": "SSAnne_1F_Room2", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 639bbcd72..7eec1735f 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM3", "name": "SSAnne_1F_Room3", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index abdde83cd..8a932c9c9 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM4", "name": "SSAnne_1F_Room4", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 7b6c778c4..6a3a6e6b0 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM5", "name": "SSAnne_1F_Room5", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 2db3bf143..2a504adce 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM6", "name": "SSAnne_1F_Room6", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index ca483216c..91746ee78 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM7", "name": "SSAnne_1F_Room7", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 36afea939..f23f839ee 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_CORRIDOR", "name": "SSAnne_2F_Corridor", "layout": "LAYOUT_SSANNE_2F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index ed0ddd056..be6042ea9 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -21,9 +21,9 @@ SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7 SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 textcolor 0 - playse SE_KAIDAN + playse SE_EXIT delay 5 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 delay 10 applymovement 1, Movement_WalkInPlaceFastestDown @@ -46,7 +46,7 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 msgbox SSAnne_2F_Corridor_Text_RivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitLeft compare VAR_TEMP_1, 1 diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 62636dfde..cfd1b60be 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM1", "name": "SSAnne_2F_Room1", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index c6cd86baa..2e12441b4 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM2", "name": "SSAnne_2F_Room2", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 0132db9eb..5d8ff0753 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM3", "name": "SSAnne_2F_Room3", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index a84f46733..157f29bf3 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM4", "name": "SSAnne_2F_Room4", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index f6dde1406..7c3e77e1e 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM5", "name": "SSAnne_2F_Room5", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 9b90147aa..a57b2e30d 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM6", "name": "SSAnne_2F_Room6", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index ce7578a4f..9c2079431 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_3F_CORRIDOR", "name": "SSAnne_3F_Corridor", "layout": "LAYOUT_SSANNE_3F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 86fe58592..4e0ad1134 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_CORRIDOR", "name": "SSAnne_B1F_Corridor", "layout": "LAYOUT_SSANNE_B1F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index ca979f0dd..cf7bf15ec 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM1", "name": "SSAnne_B1F_Room1", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index d2236e480..cd01d82b8 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM2", "name": "SSAnne_B1F_Room2", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 6aed9ce58..2dbef096c 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM3", "name": "SSAnne_B1F_Room3", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index ba41cb495..68a1ecf65 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM4", "name": "SSAnne_B1F_Room4", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index bb54b7090..ee81b03b4 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM5", "name": "SSAnne_B1F_Room5", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index d0af547d9..ffd6cc1ec 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_CAPTAINS_OFFICE", "name": "SSAnne_CaptainsOffice", "layout": "LAYOUT_SSANNE_CAPTAINS_OFFICE", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 3ccd4fa51..8b89783e9 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -8,14 +8,14 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A textcolor 3 message SSAnne_CaptainsOffice_Text_RubbedCaptainsBack waitmessage - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare call EventScript_RestorePrevTextColor delay 50 applymovement 1, Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut - giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_FAN5 + giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM msgbox SSAnne_CaptainsOffice_Text_ExplainCut setflag FLAG_GOT_HM01 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index b121ed6b1..2f74b00ec 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_DECK", "name": "SSAnne_Deck", "layout": "LAYOUT_SSANNE_DECK", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index c125abd59..000138ce8 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_EXTERIOR", "name": "SSAnne_Exterior", "layout": "LAYOUT_SSANNE_EXTERIOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 84a267ac8..3596ab81d 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -18,7 +18,7 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859 call_if_le SSAnne_Exterior_WalkDown compare VAR_0x8005, 7 call_if_ge SSAnne_Exterior_WalkInPlaceDown - fadenewbgm MUS_NAMINORI + fadenewbgm MUS_SURF delay 50 special DoSSAnneDepartureCutscene waitstate diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 951ab2b00..2470b482a 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_KITCHEN", "name": "SSAnne_Kitchen", "layout": "LAYOUT_SSANNE_KITCHEN", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 7192fd254..19231b544 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_CENTER", "name": "SafariZone_Center", "layout": "LAYOUT_SAFARI_ZONE_CENTER", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index 0d5a1430a..9a6211cd5 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_CENTER_REST_HOUSE", "name": "SafariZone_Center_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index c9a1120e6..aabf6edc8 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_EAST", "name": "SafariZone_East", "layout": "LAYOUT_SAFARI_ZONE_EAST", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 20b7a79c4..136eeb85d 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_EAST_REST_HOUSE", "name": "SafariZone_East_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 9df7f64b0..9611e34fa 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTH", "name": "SafariZone_North", "layout": "LAYOUT_SAFARI_ZONE_NORTH", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index 04e70e66f..7e2f211cd 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTH_REST_HOUSE", "name": "SafariZone_North_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index cc0eea7df..87cd7742d 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SECRET_HOUSE", "name": "SafariZone_SecretHouse", "layout": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 5ccffac5d..239f7caef 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_WEST", "name": "SafariZone_West", "layout": "LAYOUT_SAFARI_ZONE_WEST", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index 57a43a1a2..0716b11b6 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_WEST_REST_HOUSE", "name": "SafariZone_West_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 352f9aca5..d2a1b424e 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY", "name": "SaffronCity", "layout": "LAYOUT_SAFFRON_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json index 30bcffa06..fe14ef88f 100644 --- a/data/maps/SaffronCity_Connection/map.json +++ b/data/maps/SaffronCity_Connection/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_CONNECTION", "name": "SaffronCity_Connection", "layout": "LAYOUT_SAFFRON_CITY_CONNECTION", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 0dc8af3e4..a53910775 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", "name": "SaffronCity_CopycatsHouse_1F", "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index a9a3cdd59..d281922d1 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", "name": "SaffronCity_CopycatsHouse_2F", "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index bac95d5bc..34a64c7c4 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_DOJO", "name": "SaffronCity_Dojo", "layout": "LAYOUT_SAFFRON_CITY_DOJO", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 1dd8b31e1..7e08d5684 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -73,7 +73,7 @@ SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82 SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare @@ -89,7 +89,7 @@ SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc index 827d4bbd5..349c86423 100644 --- a/data/maps/SaffronCity_Gym/text.inc +++ b/data/maps/SaffronCity_Gym/text.inc @@ -5,7 +5,7 @@ SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C .string "It started when a spoon I\n" .string "carelessly tossed, bent.\p" .string "I dislike battling, but if you wish,\n" - .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$" + .string "I will show you my powers!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602 .string "This loss shocks me!\n" diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 32b191884..d1232cadb 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_HOUSE", "name": "SaffronCity_House", "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 7b1b3b527..451ee31d9 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_MART", "name": "SaffronCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index 29460d55e..6e9a5508d 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", "name": "SaffronCity_MrPsychicsHouse", "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index f4861adb1..3bf36c736 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", "name": "SaffronCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 7ed2f6050..71c05de46 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", "name": "SaffronCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 92c3b8437..dc9f24d6d 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "SaffronCity_PokemonTrainerFanClub", "layout": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index bffaf7eca..b85000671 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_1F", "name": "SeafoamIslands_1F", "layout": "LAYOUT_SEAFOAM_ISLANDS_1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 1170cd572..014da39a1 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B1F", "name": "SeafoamIslands_B1F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 0e76f6b7e..5d770655f 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B2F", "name": "SeafoamIslands_B2F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B2F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 1cb129adb..21f25cfba 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B3F", "name": "SeafoamIslands_B3F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B3F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 1ce555258..44c4268c8 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B4F", "name": "SeafoamIslands_B4F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B4F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 306a70562..9970bde9c 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -169,7 +169,7 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 7b0b3a72d..08494194a 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND", "name": "SevenIsland", "layout": "LAYOUT_SEVEN_ISLAND", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index b71cf72bd..3e11a65ca 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HARBOR", "name": "SevenIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 09550738c..d1dc104c8 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", "name": "SevenIsland_House_Room1", "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 4fc512e42..93b0a3a6e 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", "name": "SevenIsland_House_Room2", "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index cf1f24cfe..a74ef6c45 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_MART", "name": "SevenIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index e3f534260..a73cb405b 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", "name": "SevenIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 65166b9ac..f7d97b3ca 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", "name": "SevenIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 4b3f98695..824d75723 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", "name": "SevenIsland_SevaultCanyon", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index b0185700e..58c07698e 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", "name": "SevenIsland_SevaultCanyon_Entrance", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_CANYON_ENTRANCE", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index f0c537add..f697cb790 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", "name": "SevenIsland_SevaultCanyon_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 0c12e9362..eff2b5c82 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 lock goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced - playbgm MUS_P_SCHOOL, 0 + playbgm MUS_SCHOOL, 0 applymovement 1, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm @@ -22,7 +22,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 compare VAR_FACING, DIR_SOUTH call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown delay 30 - playbgm MUS_P_SCHOOL, 0 + playbgm MUS_SCHOOL, 0 applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 183af5fb2..e8f0d9181 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "name": "SevenIsland_SevaultCanyon_TanobyKey", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 54efea505..6f973074b 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -106,7 +106,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E addvar NUM_SWITCHES_PRESSED, 1 - playse SE_TRACK_MOVE + playse SE_TRUCK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 @@ -128,7 +128,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164 setvar VAR_0x8007, 2 special ShakeScreen delay 60 - playse SE_FU_ZUZUZU + playse SE_LAVARIDGE_FALL_WARP waitse return diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index b9493d2c5..31455ac19 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS", "name": "SevenIsland_TanobyRuins", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_TANOBY_RUINS", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index 6e8b55f18..f51307ed0 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", "name": "SevenIsland_TanobyRuins_DilfordChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DILFORD_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 36ae546ee..5786a9f73 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", "name": "SevenIsland_TanobyRuins_LiptooChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_LIPTOO_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index e7fc05f59..efb2dc13c 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", "name": "SevenIsland_TanobyRuins_MoneanChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_MONEAN_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index c974e67a5..e0a656acf 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", "name": "SevenIsland_TanobyRuins_RixyChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_RIXY_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index 0a604bfdd..266b18579 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", "name": "SevenIsland_TanobyRuins_ScufibChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_SCUFIB_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index c201caaf8..a1cd61249 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", "name": "SevenIsland_TanobyRuins_ViapoisChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index e85de29ad..b9e11db9b 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", "name": "SevenIsland_TanobyRuins_WeepthChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_WEEPTH_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index ded18057f..d6be87d75 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER", "name": "SevenIsland_TrainerTower", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_TRAINER_TOWER", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index ac20284fc..b867283ab 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_10F", "name": "SilphCo_10F", "layout": "LAYOUT_SILPH_CO_10F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 33c454f88..07479d1d8 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_11F", "name": "SilphCo_11F", "layout": "LAYOUT_SILPH_CO_11F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 38de05842..eceaad4be 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -18,7 +18,7 @@ SilphCo_11F_EventScript_President:: @ 8161DFE checkitemspace ITEM_MASTER_BALL, 1 compare VAR_RESULT, FALSE goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall - giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_FAN5 + giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_OBTAIN_KEY_ITEM msgbox SilphCo_11F_Text_ThatsOurSecretPrototype setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index c2a26235a..aba93eb0a 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_1F", "name": "SilphCo_1F", "layout": "LAYOUT_SILPH_CO_1F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index f5aab3042..55b2da754 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_2F", "name": "SilphCo_2F", "layout": "LAYOUT_SILPH_CO_2F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 46b1381c8..b8617c70b 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_3F", "name": "SilphCo_3F", "layout": "LAYOUT_SILPH_CO_3F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index bb1db0507..e02b30912 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_4F", "name": "SilphCo_4F", "layout": "LAYOUT_SILPH_CO_4F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 960fe8ef6..6fcc56f08 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_5F", "name": "SilphCo_5F", "layout": "LAYOUT_SILPH_CO_5F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 35ec915ad..ca17ad516 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_6F", "name": "SilphCo_6F", "layout": "LAYOUT_SILPH_CO_6F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 2857c0a7a..2257544b7 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_7F", "name": "SilphCo_7F", "layout": "LAYOUT_SILPH_CO_7F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 0bfac0151..c43c8bad1 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -32,7 +32,7 @@ SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 SilphCo_7F_EventScript_RivalScene:: @ 81619D4 textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown @@ -53,12 +53,12 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 call_if_eq SilphCo_7F_EventScript_RivalCharmander msgbox SilphCo_7F_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq SilphCo_7F_EventScript_RivalExitTop compare VAR_TEMP_1, 1 call_if_eq SilphCo_7F_EventScript_RivalExitBottom - playse SE_TK_WARPIN + playse SE_WARP_IN fadedefaultbgm removeobject 1 waitse @@ -138,7 +138,7 @@ SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8 SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare @@ -153,7 +153,7 @@ SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 7f83591ca..ed2d8dd32 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_8F", "name": "SilphCo_8F", "layout": "LAYOUT_SILPH_CO_8F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index e164a4596..a5cb18329 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_9F", "name": "SilphCo_9F", "layout": "LAYOUT_SILPH_CO_9F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 491ca323c..95e2bdfcd 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_ELEVATOR", "name": "SilphCo_Elevator", "layout": "LAYOUT_SILPH_CO_ELEVATOR", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 6156df736..89d0c6eff 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND", "name": "SixIsland", "layout": "LAYOUT_SIX_ISLAND", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index 124496895..b6447b1b2 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_ALTERING_CAVE", "name": "SixIsland_AlteringCave", "layout": "LAYOUT_SIX_ISLAND_ALTERING_CAVE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index f581ee319..802d67e26 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", "name": "SixIsland_DottedHole_1F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 1fcfc933d..7522ff81c 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", "name": "SixIsland_DottedHole_B1F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 8458d04be..e45898a49 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", "name": "SixIsland_DottedHole_B2F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 154c12c9e..5c871db50 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", "name": "SixIsland_DottedHole_B3F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 92633086e..108aa3cce 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", "name": "SixIsland_DottedHole_B4F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index a6b91e4d6..9909f8a4a 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", "name": "SixIsland_DottedHole_SapphireRoom", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index e0d558ae0..4792179ec 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -8,17 +8,17 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 lock faceplayer textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire waitmessage waitfanfare closemessage setobjectxyperm LOCALID_THIEF, 5, 0 addobject LOCALID_THIEF - playse SE_RU_HYUU + playse SE_FALL applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn waitmovement 0 - playse SE_W070 + playse SE_M_STRENGTH compare VAR_FACING, DIR_NORTH call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_SOUTH @@ -71,7 +71,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast compare VAR_FACING, DIR_WEST call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_THIEF setflag FLAG_LEARNED_YES_NAH_CHANSEY diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 6a8499ab0..30ca97e51 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_GREEN_PATH", "name": "SixIsland_GreenPath", "layout": "LAYOUT_SIX_ISLAND_GREEN_PATH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_GREEN_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 598de86e0..ce3ba9b04 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_HARBOR", "name": "SixIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index ddb6de1c9..682351b4c 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_HOUSE", "name": "SixIsland_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 015822d63..7201f0851 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_MART", "name": "SixIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index c81781c12..1c353c29b 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_OUTCAST_ISLAND", "name": "SixIsland_OutcastIsland", "layout": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_OUTCAST_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 1546d370e..37c0cca48 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_PATTERN_BUSH", "name": "SixIsland_PatternBush", "layout": "LAYOUT_SIX_ISLAND_PATTERN_BUSH", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_PATTERN_BUSH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 24e873369..4ddf8f3b5 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", "name": "SixIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 72134595e..ff8f2c4e7 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -25,7 +25,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_RIVAL, Movement_Delay48 @@ -39,7 +39,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit waitmovement 0 fadedefaultbgm - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 8db84cb02..6fa988e71 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", "name": "SixIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index e24853081..1233ea32a 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_RUIN_VALLEY", "name": "SixIsland_RuinValley", "layout": "LAYOUT_SIX_ISLAND_RUIN_VALLEY", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_RUIN_VALLEY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index acacd4d97..952fd541e 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH", "name": "SixIsland_WaterPath", "layout": "LAYOUT_SIX_ISLAND_WATER_PATH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 32fd57521..88e50542f 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", "name": "SixIsland_WaterPath_House1", "layout": "LAYOUT_HOUSE4", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index b853b622e..fe1e53c65 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", "name": "SixIsland_WaterPath_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index db9fe9ef4..b760e50b2 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND", "name": "ThreeIsland", "layout": "LAYOUT_THREE_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 484d8dba0..303fd046e 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -230,7 +230,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 waitmovement 0 applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq ThreeIsland_EventScript_LeaveBikersAlone @@ -243,7 +243,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 closemessage applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker2Intro setvar VAR_LAST_TALKED, LOCALID_BIKER2 trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat @@ -253,7 +253,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 closemessage applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker3Intro setvar VAR_LAST_TALKED, LOCALID_BIKER3 trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat @@ -275,7 +275,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 call_if_eq ThreeIsland_EventScript_PaxtonApproachMidRight compare VAR_TEMP_1, 4 call_if_eq ThreeIsland_EventScript_PaxtonApproachRight - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_PaxtonIntro setvar VAR_LAST_TALKED, LOCALID_PAXTON trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, ThreeIsland_Text_PaxtonDefeat diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 0845889ad..874b9f089 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_BERRY_FOREST", "name": "ThreeIsland_BerryForest", "layout": "LAYOUT_THREE_ISLAND_BERRY_FOREST", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 6ffa25cc4..80f8c79ed 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_BOND_BRIDGE", "name": "ThreeIsland_BondBridge", "layout": "LAYOUT_THREE_ISLAND_BOND_BRIDGE", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_BOND_BRIDGE", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index a256b5ae7..f5c957505 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", "name": "ThreeIsland_DunsparceTunnel", "layout": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_THREE_ISLE_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index d42861413..f9219d5c2 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HARBOR", "name": "ThreeIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 049581de7..aa356997b 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE1", "name": "ThreeIsland_House1", "layout": "LAYOUT_THREE_ISLAND_HOUSE1", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 3e32d7a0b..01fd8fe58 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE2", "name": "ThreeIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 7fad7b0fe..e3c4c467c 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE3", "name": "ThreeIsland_House3", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 8daa12557..25e2193a0 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE4", "name": "ThreeIsland_House4", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index ba7f2a4de..19f808a4a 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE5", "name": "ThreeIsland_House5", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index d83d1f533..c1e596005 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_MART", "name": "ThreeIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 6d0f0391b..532c0766c 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", "name": "ThreeIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 2911dc268..265d66974 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", "name": "ThreeIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 4858e3645..794b27b4e 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_PORT", "name": "ThreeIsland_Port", "layout": "LAYOUT_THREE_ISLAND_PORT", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index c5f0322f2..4c35a5942 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRADE_CENTER", "name": "TradeCenter", "layout": "LAYOUT_TRADE_CENTER", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index e5f8fc029..4b12dc8a0 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_1F", "name": "TrainerTower_1F", "layout": "LAYOUT_TRAINER_TOWER_1F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index b574b16c6..5972e45b4 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_2F", "name": "TrainerTower_2F", "layout": "LAYOUT_TRAINER_TOWER_2F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 6a3080531..10becb1c8 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_3F", "name": "TrainerTower_3F", "layout": "LAYOUT_TRAINER_TOWER_3F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 4dd210f5b..07c1183f3 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_4F", "name": "TrainerTower_4F", "layout": "LAYOUT_TRAINER_TOWER_4F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 0e0783e70..5f7d41602 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_5F", "name": "TrainerTower_5F", "layout": "LAYOUT_TRAINER_TOWER_5F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index bbece23e5..8a30e713c 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_6F", "name": "TrainerTower_6F", "layout": "LAYOUT_TRAINER_TOWER_6F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 404078579..bfdd31391 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_7F", "name": "TrainerTower_7F", "layout": "LAYOUT_TRAINER_TOWER_7F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 7f4a70deb..2b3358855 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_8F", "name": "TrainerTower_8F", "layout": "LAYOUT_TRAINER_TOWER_8F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index 869b50f82..c0a71f79e 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_ELEVATOR", "name": "TrainerTower_Elevator", "layout": "LAYOUT_TRAINER_TOWER_ELEVATOR", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 25da318a3..1fa9f1869 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_LOBBY", "name": "TrainerTower_Lobby", "layout": "LAYOUT_TRAINER_TOWER_LOBBY", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc index bdda45de8..016cc9e3d 100644 --- a/data/maps/TrainerTower_Lobby/scripts.inc +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -52,7 +52,7 @@ TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8 waitmovement 0 setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK waitse setvar VAR_TEMP_D, 0 releaseall diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index 2e7907af8..ee528571e 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_ROOF", "name": "TrainerTower_Roof", "layout": "LAYOUT_TRAINER_TOWER_ROOF", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index b3e7746c8..bb680ce77 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND", "name": "TwoIsland", "layout": "LAYOUT_TWO_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 34a6766de..f4fbfe4e4 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_CAPE_BRINK", "name": "TwoIsland_CapeBrink", "layout": "LAYOUT_TWO_ISLAND_CAPE_BRINK", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 277991b06..5ffda9b54 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", "name": "TwoIsland_CapeBrink_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index d434c3e6a..be3073e86 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_HARBOR", "name": "TwoIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 798957582..acb50d880 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_HOUSE", "name": "TwoIsland_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 4d99f4be4..213e7ea20 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", "name": "TwoIsland_JoyfulGameCorner", "layout": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER", - "music": "MUS_SLOT", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 2edfe5801..2e7290eb7 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -69,11 +69,11 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle closemessage - playse SE_DOOR + playse SE_RS_DOOR waitse applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 addobject LOCALID_BIKER applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround waitmovement 0 @@ -85,7 +85,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F closemessage applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_BIKER fadedefaultbgm delay 60 @@ -158,7 +158,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy waitmessage waitfanfare diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 517821717..ad6c90d96 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", "name": "TwoIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index bb7b1116f..d6c52f551 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", "name": "TwoIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index fbbc056af..fdd6613a0 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", "name": "UndergroundPath_EastEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index 7f53b384e..9648812ad 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", "name": "UndergroundPath_EastWestTunnel", "layout": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 3f7f48f68..9dda62055 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", "name": "UndergroundPath_NorthEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 35b7477b5..5358160b7 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", "name": "UndergroundPath_NorthSouthTunnel", "layout": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index e6153a7f7..9109d7035 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", "name": "UndergroundPath_SouthEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index efb5e86cd..9fbfb4cd6 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", "name": "UndergroundPath_WestEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index d1342af5a..ec4ea7e21 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNION_ROOM", "name": "UnionRoom", "layout": "LAYOUT_UNION_ROOM", - "music": "MUS_UNION", + "music": "MUS_UNION_ROOM", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index a00f28f90..603f2bc97 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_18_01", "name": "UnknownMap_18_01", "layout": "LAYOUT_HOUSE2", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index 6d93604e4..0d5b626e3 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_27_00", "name": "UnusedHouse_27_00", "layout": "LAYOUT_HOUSE2", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index 50dfe3d62..f5563c4cb 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_29_00", "name": "UnusedHouse_29_00", "layout": "LAYOUT_HOUSE2", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 21ec7325d..9e850ee52 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_31_05", "name": "UnusedHouse_31_05", "layout": "LAYOUT_HOUSE4", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index c03df3c58..9c3a5e558 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY", "name": "VermilionCity", "layout": "LAYOUT_VERMILION_CITY", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 2ac39f40e..17dae87dd 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -181,7 +181,7 @@ VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB closemessage call VermilionCity_Gym_EventScript_SetBeamsOff special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK waitse setflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES releaseall diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc index e364f8d10..e640a2c7c 100644 --- a/data/maps/VermilionCity_Gym/text.inc +++ b/data/maps/VermilionCity_Gym/text.inc @@ -7,7 +7,7 @@ VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4 .string "saved me during the war!\p" .string "They zapped my enemies into\n" .string "paralysis!\p" - .string "The same as I'll do to you!{PLAY_BGM}{MUS_EXEYE}$" + .string "The same as I'll do to you!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" VermilionCity_Gym_Text_LtSurgePostBattle:: @ 8194C8E .string "A little word of advice, kid!\p" diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 541974a38..5ddb668e4 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE1", "name": "VermilionCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 30a081607..c91403a4e 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE2", "name": "VermilionCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index d5afa8458..00228071a 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE3", "name": "VermilionCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index ba26357da..472cfd606 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_MART", "name": "VermilionCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index b14fc3fb5..d08b85b28 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", "name": "VermilionCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 1e233913e..8866e68b4 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", "name": "VermilionCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index dfa50ca79..b5df8639c 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", "name": "VermilionCity_PokemonFanClub", "layout": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 09f8d1d8b..a7ba114e1 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -26,7 +26,7 @@ VermilionCity_PokemonFanClub_EventScript_ChairmanStory:: @ 816B4B1 compare VAR_RESULT, FALSE goto_if_eq VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher setflag FLAG_GOT_BIKE_VOUCHER - giveitem_msg VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 + giveitem_msg VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman, ITEM_BIKE_VOUCHER, 1, MUS_OBTAIN_KEY_ITEM msgbox VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher release end diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 4593b178c..45801a27c 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_1F", "name": "VictoryRoad_1F", "layout": "LAYOUT_VICTORY_ROAD_1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 5bdc91202..4c300e6e2 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -23,7 +23,7 @@ VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33 goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 5 diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 1b3c43ef6..0c389ff08 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_2F", "name": "VictoryRoad_2F", "layout": "LAYOUT_VICTORY_ROAD_2F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 1dfd658ae..b9436a11b 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -25,7 +25,7 @@ VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5 goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 11 @@ -43,7 +43,7 @@ VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006 goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 12 diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 58870f921..c53d1d2cc 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_3F", "name": "VictoryRoad_3F", "layout": "LAYOUT_VICTORY_ROAD_3F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index f601d83be..6af6eb0bc 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -18,7 +18,7 @@ VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed setmetatile 12, 12, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 12, 13, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 7 diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 0c3a19925..ea6a6794a 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY", "name": "ViridianCity", "layout": "LAYOUT_VIRIDIAN_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc index 38561c011..44ee4d9bb 100644 --- a/data/maps/ViridianCity_Gym/text.inc +++ b/data/maps/ViridianCity_Gym/text.inc @@ -7,14 +7,14 @@ ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352 .string "So be it.\l" .string "This time, I'm not holding back!\p" .string "Once more, you shall face\n" - .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ROCKET}$" + .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$" ViridianCity_Gym_Text_GiovanniDefeat:: @ 818F43F .string "Ha!\n" .string "That was a truly intense fight.\l" .string "You have won!\p" .string "As proof, here is the EARTHBADGE!\n" - .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" + .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2 .string "Having lost in this fashion, \n" diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index e46f3be00..eb5780daa 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_HOUSE1", "name": "ViridianCity_House1", "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index e8c66213a..3b2b1cbbf 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_HOUSE2", "name": "ViridianCity_House2", "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 26fc5e46f..0428205d0 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_MART", "name": "ViridianCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index cb458b682..31d99c12c 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -28,7 +28,7 @@ ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205 waitmovement 0 msgbox ViridianCity_Mart_Text_TakeThisToProfOak setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_FAN5 + giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_OBTAIN_KEY_ITEM setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index e70f09c9f..935bcd10b 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", "name": "ViridianCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index bdeac2c5c..d34ec1462 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", "name": "ViridianCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 0c6125d6e..f8d799501 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_FOREST", "name": "ViridianForest", "layout": "LAYOUT_VIRIDIAN_FOREST", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", |