diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:52 -0400 |
| commit | 69ce45f71f49c859ca7adc07902842503c07d405 (patch) | |
| tree | 06f27893dcbc5a32d898325df733bf33d1aabae6 /data/maps | |
| parent | d7ec1d234b260df869213e195055dd75bcbe5cf3 (diff) | |
| parent | ed714f1d4910e6107f684a0f27566a0fe7c6ec6f (diff) | |
Merge pull request #799 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'data/maps')
443 files changed, 514 insertions, 514 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 9a504ae6d..a2aa1c82a 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", "name": "AbandonedShip_CaptainsOffice", "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 637081cd8..837d70cd8 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "name": "AbandonedShip_Corridors_1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index edc74fe01..18ef1f87c 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "name": "AbandonedShip_Corridors_B1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index 73c3a0e96..876a1e724 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_DECK", "name": "AbandonedShip_Deck", "layout": "LAYOUT_ABANDONED_SHIP_DECK", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 78abf1e20..b8372f9fb 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "name": "AbandonedShip_HiddenFloorCorridors", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 3c4865d81..7a057a488 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "name": "AbandonedShip_HiddenFloorRooms", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index 1b8dd19f1..f360a8faa 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOM_B1F", "name": "AbandonedShip_Room_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index e861d2c04..9ecc1d333 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_1F", "name": "AbandonedShip_Rooms2_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index c6429948f..73022386f 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F", "name": "AbandonedShip_Rooms2_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 45c54b174..44b8109d0 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_1F", "name": "AbandonedShip_Rooms_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 6955c5c91..9f1e39d2e 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_B1F", "name": "AbandonedShip_Rooms_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index 8e891b65d..4b7b9619d 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER1", "name": "AbandonedShip_Underwater1", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index 72b161120..821273e1a 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER2", "name": "AbandonedShip_Underwater2", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 387c32246..fc378e98a 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -2,7 +2,7 @@ "id": "MAP_ANCIENT_TOMB", "name": "AncientTomb", "layout": "LAYOUT_ANCIENT_TOMB", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ANCIENT_TOMB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 4077c76c8..7bf28f768 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_1F", "name": "AquaHideout_1F", "layout": "LAYOUT_AQUA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index e0e661b7a..408fe9a61 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B1F", "name": "AquaHideout_B1F", "layout": "LAYOUT_AQUA_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index c6f99621b..0ffe08dd9 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B2F", "name": "AquaHideout_B2F", "layout": "LAYOUT_AQUA_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 99cbf517d..a16f876fe 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special SetBattleTowerParty - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special ScrSpecial_HealPlayerParty diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index e30502fb6..a3c2e7974 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -82,7 +82,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox BattleTower_Lobby_Text_19A719, MSGBOX_DEFAULT @@ -112,7 +112,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare setvar VAR_0x8004, 9 special BattleTowerUtil diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index a111c1a10..f6599e285 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_1F", "name": "CaveOfOrigin_1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_1F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 71220abe6..79ff6564c 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B1F", "name": "CaveOfOrigin_B1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B2F/map.json b/data/maps/CaveOfOrigin_B2F/map.json index 0a2f03ae2..9fa080629 100644 --- a/data/maps/CaveOfOrigin_B2F/map.json +++ b/data/maps/CaveOfOrigin_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B2F", "name": "CaveOfOrigin_B2F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B2F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json index 4546d50f8..5f28936d9 100644 --- a/data/maps/CaveOfOrigin_B3F/map.json +++ b/data/maps/CaveOfOrigin_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B3F", "name": "CaveOfOrigin_B3F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B3F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json index 5270d384b..729d68639 100644 --- a/data/maps/CaveOfOrigin_B4F/map.json +++ b/data/maps/CaveOfOrigin_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B4F", "name": "CaveOfOrigin_B4F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B4F", - "music": "SE_STOP", + "music": "MUS_DUMMY", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index 96cf8610d..5134e8f5a 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -35,7 +35,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 doweather special WaitWeather waitstate - playse SE_W197 + playse SE_M_DETECT setfieldeffectargument 0, 9 setfieldeffectargument 1, 13 setfieldeffectargument 2, 0 @@ -46,7 +46,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else setvar VAR_RESULT, 2 .endif - playse SE_TAMA + playse SE_ORB special sub_80818A4 waitstate special sub_80818FC diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 12df1094b..74ea88d7f 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE", "name": "CaveOfOrigin_Entrance", "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index d545443f8..271eabd9c 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_DESERT_RUINS", "name": "DesertRuins", "layout": "LAYOUT_DESERT_RUINS", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_DESERT_RUINS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 4e130a9df..4e70621ab 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN", "name": "DewfordTown", "layout": "LAYOUT_DEWFORD_TOWN", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index f440d1a5c..076828af7 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_GYM", "name": "DewfordTown_Gym", "layout": "LAYOUT_DEWFORD_TOWN_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 30f7b2b6d..d4a5372dd 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -55,25 +55,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C - playse SE_MU_PACHI + playse SE_SWITCH animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index ee688c9c3..5fb5ebf63 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HALL", "name": "DewfordTown_Hall", "layout": "LAYOUT_DEWFORD_TOWN_HALL", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index 48d1a10dd..53f16b6fa 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE1", "name": "DewfordTown_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index ec2145201..7cf7a90b2 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE2", "name": "DewfordTown_House2", "layout": "LAYOUT_HOUSE4", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index e1cacefb1..be7c8d24d 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", "name": "DewfordTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 061d5228e..03ee1c40d 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", "name": "DewfordTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index 3ce7e8570..f963c8154 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -2,7 +2,7 @@ "id": "MAP_DOUBLE_BATTLE_COLOSSEUM", "name": "DoubleBattleColosseum", "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 06fb9c275..96c441cca 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY", "name": "EverGrandeCity", "layout": "LAYOUT_EVER_GRANDE_CITY", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index fb425c537..8f73c582d 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", "name": "EverGrandeCity_ChampionsRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 5fdb9e18d..c53b2821e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -38,7 +38,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playbgm MUS_DAIGO, FALSE + playbgm MUS_ENCOUNTER_CHAMPION, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 @@ -67,11 +67,11 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playbgm MUS_GIRL_SUP, FALSE + playbgm MUS_ENCOUNTER_MAY, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playbgm MUS_BOY_SUP, FALSE + playbgm MUS_ENCOUNTER_BRENDAN, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 diff --git a/data/maps/EverGrandeCity_Corridor1/map.json b/data/maps/EverGrandeCity_Corridor1/map.json index 86723c0f2..8a498bc69 100644 --- a/data/maps/EverGrandeCity_Corridor1/map.json +++ b/data/maps/EverGrandeCity_Corridor1/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR1", "name": "EverGrandeCity_Corridor1", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor2/map.json b/data/maps/EverGrandeCity_Corridor2/map.json index 692e6daa7..5107218c8 100644 --- a/data/maps/EverGrandeCity_Corridor2/map.json +++ b/data/maps/EverGrandeCity_Corridor2/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR2", "name": "EverGrandeCity_Corridor2", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor3/map.json b/data/maps/EverGrandeCity_Corridor3/map.json index aa5544f4d..9d74e674d 100644 --- a/data/maps/EverGrandeCity_Corridor3/map.json +++ b/data/maps/EverGrandeCity_Corridor3/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR3", "name": "EverGrandeCity_Corridor3", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor4/map.json b/data/maps/EverGrandeCity_Corridor4/map.json index 9c0daf82f..6657a887d 100644 --- a/data/maps/EverGrandeCity_Corridor4/map.json +++ b/data/maps/EverGrandeCity_Corridor4/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR4", "name": "EverGrandeCity_Corridor4", "layout": "LAYOUT_EVER_GRANDE_CITY_CORRIDOR4", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor5/map.json b/data/maps/EverGrandeCity_Corridor5/map.json index c310da938..ddc78db25 100644 --- a/data/maps/EverGrandeCity_Corridor5/map.json +++ b/data/maps/EverGrandeCity_Corridor5/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR5", "name": "EverGrandeCity_Corridor5", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 719451beb..33e700a39 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", "name": "EverGrandeCity_DrakesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index fcf09914b..e1550a32a 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 7938c77d2..b87ef8dd8 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "name": "EverGrandeCity_GlaciasRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index d4b5c8582..25eab43a1 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index d35d5c2d9..05ef799ec 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", "name": "EverGrandeCity_HallOfFame", "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", - "music": "MUS_EIKOU_R", + "music": "MUS_HALL_OF_FAME_ROOM", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index c65c87385..149cc1cba 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "name": "EverGrandeCity_PhoebesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index c5394ecb0..9c075efe9 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 2ac4d15b9..14a28f31b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", "name": "EverGrandeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index 7266578b8..31c4ee85c 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", "name": "EverGrandeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.json b/data/maps/EverGrandeCity_PokemonLeague/map.json index 7583323bc..fe6b3aa3a 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE", "name": "EverGrandeCity_PokemonLeague", "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index d13f20f1d..dfa6e2657 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -61,7 +61,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE message EverGrandeCity_PokemonLeague_Text_191804 waitmessage waitfanfare @@ -83,7 +83,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A - playse SE_HAZURE + playse SE_FAILURE msgbox EverGrandeCity_PokemonLeague_Text_19179C, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 733266cfa..1f039f73f 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "name": "EverGrandeCity_SidneysRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 7bd896364..42b91a9c8 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 71e07b7c3..003305be1 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN", "name": "FallarborTown", "layout": "LAYOUT_FALLARBOR_TOWN", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index b87d95542..cc915bf9b 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_CONTEST_HALL", "name": "FallarborTown_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index 770a14a65..bdb84d24b 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_CONTEST_LOBBY", "name": "FallarborTown_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index f9a2cccce..ac38ff349 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index e809610c8..8447b9a40 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_HOUSE1", "name": "FallarborTown_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index bd522be27..16a5a997e 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_HOUSE2", "name": "FallarborTown_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index e325134c4..78ddc53c9 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_MART", "name": "FallarborTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index ee1a96ba7..a8bc85cc8 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", "name": "FallarborTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 133b4626a..93b87791d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playse SE_JIDO_DOA + playse SE_SLIDING_DOOR removeobject 4 clearflag FLAG_HIDE_LANETTE release diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 4dec245fe..b49f288e8 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", "name": "FallarborTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index c02965a1d..f21b4d1f3 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIERY_PATH", "name": "FieryPath", "layout": "LAYOUT_FIERY_PATH", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_FIERY_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index a3e85f687..17797b153 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY", "name": "FortreeCity", "layout": "LAYOUT_FORTREE_CITY", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 896aa737e..0b2ab9859 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_DECORATION_SHOP", "name": "FortreeCity_DecorationShop", "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index c967fd6c8..bd9c03ddd 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_GYM", "name": "FortreeCity_Gym", "layout": "LAYOUT_FORTREE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 1043bec20..8c0e4eb13 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE1", "name": "FortreeCity_House1", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 47ccdfbb3..576d3ac19 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE2", "name": "FortreeCity_House2", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 85509eed4..ff1476700 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE3", "name": "FortreeCity_House3", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index c0256d8a4..737366a2c 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE4", "name": "FortreeCity_House4", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 5324d59f2..b47d16a59 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE5", "name": "FortreeCity_House5", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index ebf83b274..26085efe2 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_MART", "name": "FortreeCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index e5ab2916d..2f197c811 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", "name": "FortreeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 169f5ac1c..411643cdd 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", "name": "FortreeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index c19b0e793..f5c8f32b3 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_1F", "name": "GraniteCave_1F", "layout": "LAYOUT_GRANITE_CAVE_1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 0d8e71457..e89e54af4 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B1F", "name": "GraniteCave_B1F", "layout": "LAYOUT_GRANITE_CAVE_B1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index fc4993edc..1e3715ff3 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B2F", "name": "GraniteCave_B2F", "layout": "LAYOUT_GRANITE_CAVE_B2F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 18ddac4b3..f906ecc71 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_STEVENS_ROOM", "name": "GraniteCave_StevensRoom", "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 861b0eccb..584f64818 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare VAR_FACING, 4 call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D - playse SE_KAIDAN + playse SE_EXIT removeobject 1 release end diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 2847ebb9c..799e03a18 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -2,7 +2,7 @@ "id": "MAP_INSIDE_OF_TRUCK", "name": "InsideOfTruck", "layout": "LAYOUT_INSIDE_OF_TRUCK", - "music": "SE_STOP", + "music": "MUS_DUMMY", "region_map_section": "MAPSEC_INSIDE_OF_TRUCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index 405f2699c..e596171d1 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_ISLAND_CAVE", "name": "IslandCave", "layout": "LAYOUT_ISLAND_CAVE", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ISLAND_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 1b5d84086..ad7895bf8 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -37,7 +37,7 @@ S_OpenRegiceChamber:: @ 815EF19 setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0 setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setflag FLAG_SYS_BRAILLE_WAIT end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 6076e813d..c9249944e 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -2,7 +2,7 @@ "id": "MAP_JAGGED_PASS", "name": "JaggedPass", "layout": "LAYOUT_JAGGED_PASS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_JAGGED_PASS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index dffded86a..891d6f5f6 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN", "name": "LavaridgeTown", "layout": "LAYOUT_LAVARIDGE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 7a868e72e..6d1038f86 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -57,11 +57,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return LavaridgeTown_EventScript_14E570:: @ 814E570 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -280,7 +280,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LavaridgeTown_Text_16C2EA waitfanfare waitmessage diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 7d1979893..dce2f6a9c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_1F", "name": "LavaridgeTown_Gym_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 4f11e429f..2f71b1ab9 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_B1F", "name": "LavaridgeTown_Gym_B1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 385573370..19844ca33 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP", "name": "LavaridgeTown_HerbShop", "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 119f2f10f..e26429d11 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HOUSE", "name": "LavaridgeTown_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index a19b8bf95..aa7c903af 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_MART", "name": "LavaridgeTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 6f722df89..3bdeb893d 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", "name": "LavaridgeTown_PokemonCenter_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index b6dbb1b47..9757ba74b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", "name": "LavaridgeTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 7da6b4d91..12acd197c 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY", "name": "LilycoveCity", "layout": "LAYOUT_LILYCOVE_CITY", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 38fbd3472..22f980016 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -245,7 +245,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 compare VAR_RESULT, NO @@ -274,7 +274,7 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C compare VAR_RESULT, NO diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index d0f411d54..50c564c38 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_HALL", "name": "LilycoveCity_ContestHall", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 83697d1e8..e02316d09 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", "name": "LilycoveCity_ContestLobby", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index dc3031bda..5dabc84a3 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -77,7 +77,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_188C03, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, MSGBOX_DEFAULT @@ -249,7 +249,7 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_188C03, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, MSGBOX_DEFAULT @@ -492,13 +492,13 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 9, 2, METATILE_Contest_WallShadow, 1 setmetatile 9, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 9, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 9, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView @@ -631,13 +631,13 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 4bcb4ab57..7b8e0fc18 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", "name": "LilycoveCity_CoveLilyMotel_1F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 954635fbd..b64205eb1 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", "name": "LilycoveCity_CoveLilyMotel_2F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 1b48e4b4d..c6fa2f6c0 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -18,7 +18,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag FLAG_TEMP_2 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 4f3fd5189..5b5479ac3 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "LilycoveCity_DepartmentStoreElevator", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 83412d697..c27ac3f66 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", "name": "LilycoveCity_DepartmentStoreRooftop", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 5b7fafb87..4578313b5 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 77d3eb262..461c299a4 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", "name": "LilycoveCity_DepartmentStore_1F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index 503dc35c5..3d0ec8c37 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", "name": "LilycoveCity_DepartmentStore_2F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index 49b978443..a09224702 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", "name": "LilycoveCity_DepartmentStore_3F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index f6d7ea584..8e39d129c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", "name": "LilycoveCity_DepartmentStore_4F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 951ccadab..141fea32b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", "name": "LilycoveCity_DepartmentStore_5F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_EmptyMap/map.json b/data/maps/LilycoveCity_EmptyMap/map.json index 555c36be7..56d65fb07 100644 --- a/data/maps/LilycoveCity_EmptyMap/map.json +++ b/data/maps/LilycoveCity_EmptyMap/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_EMPTY_MAP", "name": "LilycoveCity_EmptyMap", "layout": "LAYOUT_LILYCOVE_CITY_EMPTY_MAP", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 5b31c8129..e4fc39663 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HARBOR", "name": "LilycoveCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index f3e5f9062..21cd211ef 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE1", "name": "LilycoveCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 37c25007d..2f13f9c2a 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE2", "name": "LilycoveCity_House2", "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 4c8b928e4..c7e9c3a21 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE3", "name": "LilycoveCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 874f8f6df..0fc561101 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE4", "name": "LilycoveCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 4fd29b047..b980a1cec 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", "name": "LilycoveCity_LilycoveMuseum_1F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index fc1a594d4..a8b1b0ec2 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", "name": "LilycoveCity_LilycoveMuseum_2F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index 1893cbd0d..142157ed7 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", "name": "LilycoveCity_MoveDeletersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 39ab9984a..0c2b38dcf 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special DeleteMonMove - playfanfare MUS_ME_WASURE + playfanfare MUS_MOVE_DELETED waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, MSGBOX_DEFAULT releaseall diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 96bebc00d..131b59dbc 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", "name": "LilycoveCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index 8d6ec1169..16d807a00 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", "name": "LilycoveCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 9d58bfc29..9e68c0a00 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "LilycoveCity_PokemonTrainerFanClub", "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index f66009546..fa9b85c24 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_UNUSED_MART", "name": "LilycoveCity_UnusedMart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index 35a00a498..65df32217 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM1", "name": "LinkContestRoom1", "layout": "LAYOUT_LINK_CONTEST_ROOM1", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index df95d1e41..2acb2a444 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - savebgm MUS_TEST1 + savebgm MUS_LINK_CONTEST_P1 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - savebgm MUS_TEST2 + savebgm MUS_LINK_CONTEST_P2 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - savebgm MUS_TEST3 + savebgm MUS_LINK_CONTEST_P3 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - savebgm MUS_TEST4 + savebgm MUS_LINK_CONTEST_P4 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - savebgm MUS_CONTEST0 + savebgm MUS_CONTEST return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json index c018394a4..535623613 100644 --- a/data/maps/LinkContestRoom2/map.json +++ b/data/maps/LinkContestRoom2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM2", "name": "LinkContestRoom2", "layout": "LAYOUT_LINK_CONTEST_ROOM2", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json index 2cd4ac89e..5e8910662 100644 --- a/data/maps/LinkContestRoom3/map.json +++ b/data/maps/LinkContestRoom3/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM3", "name": "LinkContestRoom3", "layout": "LAYOUT_LINK_CONTEST_ROOM3", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json index 0c1bd764f..5540b6c4b 100644 --- a/data/maps/LinkContestRoom4/map.json +++ b/data/maps/LinkContestRoom4/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM4", "name": "LinkContestRoom4", "layout": "LAYOUT_LINK_CONTEST_ROOM4", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json index c2360ee23..27506a462 100644 --- a/data/maps/LinkContestRoom5/map.json +++ b/data/maps/LinkContestRoom5/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM5", "name": "LinkContestRoom5", "layout": "LAYOUT_LINK_CONTEST_ROOM5", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json index cc556b5ca..9b8bed134 100644 --- a/data/maps/LinkContestRoom6/map.json +++ b/data/maps/LinkContestRoom6/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM6", "name": "LinkContestRoom6", "layout": "LAYOUT_LINK_CONTEST_ROOM6", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 2ce0ea4a1..25a27a528 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN", "name": "LittlerootTown", "layout": "LAYOUT_LITTLEROOT_TOWN", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 7b45aa651..dcdf452dd 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -98,7 +98,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 - playse SE_DANSA + playse SE_LEDGE applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6C0 waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 @@ -865,7 +865,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_Text_16AA32 waitfanfare waitmessage diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 5c8d5c2e0..f375cc602 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", "name": "LittlerootTown_BrendansHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 2d0a0f901..c3e94b4e5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", "name": "LittlerootTown_BrendansHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index ac2048fbf..8cc646d22 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", "name": "LittlerootTown_MaysHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 877166683..1e76f4d25 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", "name": "LittlerootTown_MaysHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 660f68e5e..c97ac979e 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -35,7 +35,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A - playse SE_KAIDAN + playse SE_EXIT removeobject VAR_LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_STATE, 1 @@ -46,7 +46,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, MSGBOX_DEFAULT - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark @@ -80,7 +80,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, MSGBOX_DEFAULT - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 214bc4654..0632dae2c 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", "name": "LittlerootTown_ProfessorBirchsLab", "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", - "music": "MUS_ODAMAKI", + "music": "MUS_BIRCH_LAB", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 15267ec8a..f72178096 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO compare VAR_RESULT, YES @@ -153,7 +153,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index dba9b43bc..fb816c036 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_1F", "name": "MagmaHideout_1F", "layout": "LAYOUT_MAGMA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_B1F/map.json b/data/maps/MagmaHideout_B1F/map.json index 6219a75db..1d70b7868 100644 --- a/data/maps/MagmaHideout_B1F/map.json +++ b/data/maps/MagmaHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_B1F", "name": "MagmaHideout_B1F", "layout": "LAYOUT_MAGMA_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_B2F/map.json b/data/maps/MagmaHideout_B2F/map.json index 8562e15d6..4aefc7977 100644 --- a/data/maps/MagmaHideout_B2F/map.json +++ b/data/maps/MagmaHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_B2F", "name": "MagmaHideout_B2F", "layout": "LAYOUT_MAGMA_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index fa745647e..77b21d296 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY", "name": "MauvilleCity", "layout": "LAYOUT_MAUVILLE_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 50ad62df9..fe61fb6e1 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_BIKE_SHOP", "name": "MauvilleCity_BikeShop", "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index f8e2ed505..6ef698b65 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GAME_CORNER", "name": "MauvilleCity_GameCorner", "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", - "music": "MUS_CASINO", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 3e439332f..d852ef406 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -62,7 +62,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -163,7 +163,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 removecoins 1000 adddecoration DECOR_TREECKO_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -179,7 +179,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 removecoins 1000 adddecoration DECOR_TORCHIC_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -195,7 +195,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA removecoins 1000 adddecoration DECOR_MUDKIP_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -297,7 +297,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C removecoins 1500 additem ITEM_TM32_DOUBLE_TEAM updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 removecoins 3500 additem ITEM_TM29_PSYCHIC updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 removecoins 4000 additem ITEM_TM35_FLAMETHROWER updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA removecoins 4000 additem ITEM_TM24_THUNDERBOLT updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 removecoins 4000 additem ITEM_TM13_ICE_BEAM updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -466,7 +466,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C setflag FLAG_RECEIVED_20_COINS addcoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, MSGBOX_DEFAULT - playse SE_REGI + playse SE_SHOP goto MauvilleCity_GameCorner_EventScript_1570CA end diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 0ad9f27d4..cf4d2e0e3 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GYM", "name": "MauvilleCity_Gym", "layout": "LAYOUT_MAUVILLE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index f7af8e1d0..7afaafceb 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call Common_EventScript_SetGymTrainers special MauvilleGymSpecial3 special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK goto MauvilleCity_Gym_EventScript_15661D end @@ -140,7 +140,7 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1 goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC releaseall diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 30ef32dcd..f9fd5c248 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE1", "name": "MauvilleCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 83d979d2c..0e603641b 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE2", "name": "MauvilleCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 48b2dc552..dfa55a4fe 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_MART", "name": "MauvilleCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 3964d626a..861ea6697 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", "name": "MauvilleCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 163d79fb4..6dcfb8737 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", "name": "MauvilleCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 221538cf2..12a963d13 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_1R", "name": "MeteorFalls_1F_1R", "layout": "LAYOUT_METEOR_FALLS_1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 91a12d462..3a1c797b9 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_2R", "name": "MeteorFalls_1F_2R", "layout": "LAYOUT_METEOR_FALLS_1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index 293d0da4f..c51b96dc5 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_1R", "name": "MeteorFalls_B1F_1R", "layout": "LAYOUT_METEOR_FALLS_B1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index cfc99f8a7..c1f05e0f5 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_2R", "name": "MeteorFalls_B1F_2R", "layout": "LAYOUT_METEOR_FALLS_B1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 4c6f537c6..0f26395c9 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY", "name": "MossdeepCity", "layout": "LAYOUT_MOSSDEEP_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index c2cc37d06..fc0efe1db 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", "name": "MossdeepCity_GameCorner_1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 6c2c8f4da..15720578d 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", "name": "MossdeepCity_GameCorner_B1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index a054a3a8b..6e154966d 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GYM", "name": "MossdeepCity_Gym", "layout": "LAYOUT_MOSSDEEP_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index bc86b3ead..3bf33b344 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA MossdeepCity_Gym_EventScript_15A619:: @ 815A619 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK releaseall end diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index f8fb6e396..775528b73 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE1", "name": "MossdeepCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 597fac8ff..e77f14b2c 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE2", "name": "MossdeepCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 335ce50e7..8a28a7138 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE3", "name": "MossdeepCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index f23896831..f400dca3e 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE4", "name": "MossdeepCity_House4", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 8c985ab2b..8ec308187 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_MART", "name": "MossdeepCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 16d1152da..bb07b222b 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", "name": "MossdeepCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index ed4ab3c74..e60666508 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", "name": "MossdeepCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index b250b5382..1591bb73f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", "name": "MossdeepCity_SpaceCenter_1F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 8537f7291..466db08fa 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", "name": "MossdeepCity_SpaceCenter_2F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index df63c5ca8..25a1f38a5 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", "name": "MossdeepCity_StevensHouse", "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 07fe1b296..bc3c6b2f9 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -78,7 +78,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar VAR_0x8004, VAR_RESULT removeobject 2 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index fada71876..0befcf8a2 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY", "name": "MtChimney", "layout": "LAYOUT_MT_CHIMNEY", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_ASH", diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 761d074de..c44257d94 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", "name": "MtChimney_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 1c02bd68f..b78524b9a 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_1F", "name": "MtPyre_1F", "layout": "LAYOUT_MT_PYRE_1F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index d49dcb1e9..9e740aaad 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_2F", "name": "MtPyre_2F", "layout": "LAYOUT_MT_PYRE_2F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index a2f36446f..40dfbf151 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_3F", "name": "MtPyre_3F", "layout": "LAYOUT_MT_PYRE_3F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 6469f0b8c..81b432e10 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_4F", "name": "MtPyre_4F", "layout": "LAYOUT_MT_PYRE_4F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 11ffc89db..611e41954 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_5F", "name": "MtPyre_5F", "layout": "LAYOUT_MT_PYRE_5F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index 5dad923b4..3ec42a9b1 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_6F", "name": "MtPyre_6F", "layout": "LAYOUT_MT_PYRE_6F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 3cb7c7815..dd9ce29ff 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_EXTERIOR", "name": "MtPyre_Exterior", "layout": "LAYOUT_MT_PYRE_EXTERIOR", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index cb7c8db49..ae6c856a1 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_SUMMIT", "name": "MtPyre_Summit", "layout": "LAYOUT_MT_PYRE_SUMMIT", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 4162f2bfb..44adf56b9 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_ENTRANCE", "name": "NewMauville_Entrance", "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index ecc52cfa0..5595b1720 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0 setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 0aef219af..0ee17aaa5 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_INSIDE", "name": "NewMauville_Inside", "layout": "LAYOUT_NEW_MAUVILLE_INSIDE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 45b3ce38a..37df7aa62 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN", "name": "OldaleTown", "layout": "LAYOUT_OLDALE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index ba3a1868e..fdad86c1c 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -38,7 +38,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79 goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE msgbox OldaleTown_Text_16AEF2, MSGBOX_DEFAULT closemessage switch VAR_FACING diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 568b9187b..484e9d919 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE1", "name": "OldaleTown_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index b863c6f72..e14f7d6de 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE2", "name": "OldaleTown_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 960be303b..3491333f3 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_MART", "name": "OldaleTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 007924f75..22526e475 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", "name": "OldaleTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 2bd8eff9c..0b857a04c 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", "name": "OldaleTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 50e30456b..a929d586b 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN", "name": "PacifidlogTown", "layout": "LAYOUT_PACIFIDLOG_TOWN", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 4e8810514..0b20e0a18 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE1", "name": "PacifidlogTown_House1", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 702277046..599b6c094 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE2", "name": "PacifidlogTown_House2", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index c4cdcb362..65491d51d 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE3", "name": "PacifidlogTown_House3", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 4f5fd22b1..f2a66cb9d 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE4", "name": "PacifidlogTown_House4", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index cda98d9db..5b80ab704 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE5", "name": "PacifidlogTown_House5", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 744594889..d74698bee 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", "name": "PacifidlogTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index ac2849775..a81efcaf0 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", "name": "PacifidlogTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index aaddb65cb..53627f989 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY", "name": "PetalburgCity", "layout": "LAYOUT_PETALBURG_CITY", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 7c02a67f7..6eac0b301 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - savebgm MUS_TSURETEK + savebgm MUS_FOLLOW_ME return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -182,7 +182,7 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, Common_Movement_FacePlayer waitmovement 0 - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 0e96f6731..724914a04 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_GYM", "name": "PetalburgCity_Gym", "layout": "LAYOUT_PETALBURG_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 07e1394a7..90add0107 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -76,7 +76,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject 10 setflag FLAG_HIDE_WALLY_PETALBURG delay 30 @@ -187,7 +187,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, MSGBOX_DEFAULT closemessage setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_154835 compare VAR_0x8008, 1 diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index ca5dfb729..77b80eb1a 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE1", "name": "PetalburgCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 943c9b1f9..f840d202c 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE2", "name": "PetalburgCity_House2", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index db1e4a94d..0ff957f5f 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_MART", "name": "PetalburgCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index bf15fd1cc..ed161a3ca 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", "name": "PetalburgCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index df425c8f5..eb3e89650 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", "name": "PetalburgCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index c5e040de6..c97e8c328 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE", "name": "PetalburgCity_WallysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 36c312bbe..036ec469f 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_WOODS", "name": "PetalburgWoods", "layout": "LAYOUT_PETALBURG_WOODS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_PETALBURG_WOODS", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 804987129..2f8b276ce 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_RECORD_CORNER", "name": "RecordCorner", "layout": "LAYOUT_RECORD_CORNER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 24d4c2360..b567044d2 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE101", "name": "Route101", "layout": "LAYOUT_ROUTE101", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_101", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 60e67565d..b042ab903 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playbgm MUS_EVENT0, TRUE + playbgm MUS_HELP, TRUE msgbox Route101_Text_16D10E, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 54262a239..cba038763 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE102", "name": "Route102", "layout": "LAYOUT_ROUTE102", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_102", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 691cc719a..cb2a70a6b 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE103", "name": "Route103", "layout": "LAYOUT_ROUTE103", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_103", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 637a2a85a..ea9dc841d 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, MSGBOX_DEFAULT - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE applymovement 2, Common_Movement_FacePlayer waitmovement 0 applymovement 2, Common_Movement_ExclamationMark @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, MSGBOX_DEFAULT - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE applymovement 2, Common_Movement_FacePlayer waitmovement 0 applymovement 2, Common_Movement_ExclamationMark @@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9 Route103_EventScript_14ED0C:: @ 814ED0C applymovement 2, Route103_Movement_14ED67 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement 2, Route103_Movement_14ED6B waitmovement 0 goto Route103_EventScript_14ED46 @@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C Route103_EventScript_14ED29:: @ 814ED29 applymovement 2, Route103_Movement_14ED71 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement 2, Route103_Movement_14ED74 waitmovement 0 goto Route103_EventScript_14ED46 diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index fd90b70e5..3a5fef615 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104", "name": "Route104", "layout": "LAYOUT_ROUTE104", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 6dcc22109..7322b2066 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE", "name": "Route104_MrBrineysHouse", "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index b949583ed..fd3e7cb0a 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index 286dbaaa2..b769374f9 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE", "name": "Route104_Prototype", "layout": "LAYOUT_ROUTE104_PROTOTYPE", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index 8e532a031..479a2384d 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrototypePrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 378acb257..497fd19f3 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE105", "name": "Route105", "layout": "LAYOUT_ROUTE105", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_105", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 6fba97556..f1df4be1a 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE106", "name": "Route106", "layout": "LAYOUT_ROUTE106", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_106", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 369697c74..51ef3a9c0 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE107", "name": "Route107", "layout": "LAYOUT_ROUTE107", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_107", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 0763b7dfc..2092e0f4a 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE108", "name": "Route108", "layout": "LAYOUT_ROUTE108", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_108", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 8345481c4..bcdaaf259 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109", "name": "Route109", "layout": "LAYOUT_ROUTE109", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 49e8a7751..ccb50b680 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109_SEASHORE_HOUSE", "name": "Route109_SeashoreHouse", "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 93fb927dc..7aef1715f 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110", "name": "Route110", "layout": "LAYOUT_ROUTE110", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 80605c132..75341ea2c 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return Route110_EventScript_14FDAC:: @ 814FDAC - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return Route110_EventScript_14FDB1:: @ 814FDB1 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index dc7060d9b..f073d60c7 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadNorthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRACE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 2d17f1f79..91e54f251 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadSouthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRACE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index 116e0994d..ece6984cb 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", "name": "Route110_TrickHouseCorridor", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index bf413874d..a992e138d 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_END", "name": "Route110_TrickHouseEnd", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 683637648..167f9bf58 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -182,7 +182,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 @@ -230,7 +230,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_161CEA waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index ca869dcdc..79cef3649 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", "name": "Route110_TrickHouseEntrance", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 794237957..59797f90f 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -213,7 +213,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -462,7 +462,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -707,7 +707,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waitmessage diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index e9d7922ae..1d059f3df 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", "name": "Route110_TrickHousePuzzle1", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index c006dcebc..6755424a5 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2", "name": "Route110_TrickHousePuzzle2", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 6ff77999b..11249d223 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3", "name": "Route110_TrickHousePuzzle3", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 020c1442f..8b2b3025d 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4", "name": "Route110_TrickHousePuzzle4", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index f3fc7de40..6cb94cae7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5", "name": "Route110_TrickHousePuzzle5", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 6836211bd..903ccc999 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -389,7 +389,7 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 waitse - playse SE_HAZURE + playse SE_FAILURE msgbox Route110_TrickHousePuzzle5_Text_19D5CF, MSGBOX_DEFAULT applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F @@ -408,7 +408,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF waitse - playse SE_SEIKAI + playse SE_SUCCESS goto Route110_TrickHousePuzzle5_EventScript_162DE9 end diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index d6c9966f4..b0a39b700 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6", "name": "Route110_TrickHousePuzzle6", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 508cc6d1f..df9c47be5 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", "name": "Route110_TrickHousePuzzle7", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 589e77983..8491b5220 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -119,7 +119,7 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9 end @@ -130,7 +130,7 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3 end @@ -141,7 +141,7 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD end @@ -152,7 +152,7 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7 end @@ -163,7 +163,7 @@ Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1 end diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 19d7a006f..0b6b06cf5 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8", "name": "Route110_TrickHousePuzzle8", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 5f3dba03f..d5cd385d8 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111", "name": "Route111", "layout": "LAYOUT_ROUTE111", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 163fe11da..295cab713 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -219,14 +219,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather WEATHER_SUNNY - fadenewbgm MUS_DOORO_X1 + fadenewbgm MUS_ROUTE110 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather WEATHER_SANDSTORM - fadenewbgm MUS_ASHROAD + fadenewbgm MUS_ROUTE111 doweather end diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index a617e7307..d89409184 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP", "name": "Route111_OldLadysRestStop", "layout": "LAYOUT_HOUSE3", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 2ee5c83de..5fe9e1a9c 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", "name": "Route111_WinstrateFamilysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 88cf1c2b3..b5651711c 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112", "name": "Route112", "layout": "LAYOUT_ROUTE112", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index b3b8c0ea1..27940bc66 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112_CABLE_CAR_STATION", "name": "Route112_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 88311edd7..f8fb82631 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113", "name": "Route113", "layout": "LAYOUT_ROUTE113", - "music": "MUS_KAZANBAI", + "music": "MUS_ROUTE113", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 14982c2d4..3d6687d35 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113_GLASS_WORKSHOP", "name": "Route113_GlassWorkshop", "layout": "LAYOUT_HOUSE4", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index d237ccf16..72afb8330 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114", "name": "Route114", "layout": "LAYOUT_ROUTE114", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 0cc1cebc5..2ac163837 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", "name": "Route114_FossilManiacsHouse", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index dd42dd934..62563a426 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", "name": "Route114_FossilManiacsTunnel", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index af62dac96..e1182536c 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_LANETTES_HOUSE", "name": "Route114_LanettesHouse", "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 2e6fb8545..764945bde 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE115", "name": "Route115", "layout": "LAYOUT_ROUTE115", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_115", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 2ec98302e..741309055 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116", "name": "Route116", "layout": "LAYOUT_ROUTE116", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 9b07d84e3..653074880 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", "name": "Route116_TunnelersRestHouse", "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 368fa9d6e..eff08e1ee 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117", "name": "Route117", "layout": "LAYOUT_ROUTE117", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index ebb732d35..7ba6120b2 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117_POKEMON_DAY_CARE", "name": "Route117_PokemonDayCare", "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index be767e166..9dfc95194 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -76,7 +76,7 @@ Route118_EventScript_150FE4:: @ 8150FE4 end Route118_EventScript_151004:: @ 8151004 - playse SE_DANSA + playse SE_LEDGE applymovement 19, Route118_Movement_15106D waitmovement 0 delay 30 diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 0cdba1552..e275d0b10 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119", "name": "Route119", "layout": "LAYOUT_ROUTE119", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 3b4e9c51f..b1307f0e4 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -79,11 +79,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return Route119_EventScript_151259:: @ 8151259 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return Route119_EventScript_15125E:: @ 815125E diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index cb41137b0..9c9468d59 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_HOUSE", "name": "Route119_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 3ca2fd306..7dc0223fd 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", "name": "Route119_WeatherInstitute_1F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 13f9009c8..4d951a18e 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", "name": "Route119_WeatherInstitute_2F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 18aba2003..6a14b2c60 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A getpartysize compare VAR_RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index bc3473476..19c9f8846 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE120", "name": "Route120", "layout": "LAYOUT_ROUTE120", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_120", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 92fc5b59f..7b610e9dd 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121", "name": "Route121", "layout": "LAYOUT_ROUTE121", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 3c1220c49..993cdd403 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", "name": "Route121_SafariZoneEntrance", "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 6fa9c8d81..481f243fc 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waitmessage diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 1037df207..e1aabb090 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE122", "name": "Route122", "layout": "LAYOUT_ROUTE122", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_122", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index 4cb877538..7dc367d1a 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123", "name": "Route123", "layout": "LAYOUT_ROUTE123", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 9cdf9620e..ff3252a88 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", "name": "Route123_BerryMastersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 717381caf..1eda0bd74 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124", "name": "Route124", "layout": "LAYOUT_ROUTE124", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 775508c2d..ef800009b 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", "name": "Route124_DivingTreasureHuntersHouse", "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 51e39ac41..418afc5f9 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE125", "name": "Route125", "layout": "LAYOUT_ROUTE125", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_125", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index a6ab407ff..e9cf0075c 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE126", "name": "Route126", "layout": "LAYOUT_ROUTE126", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_126", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 6b471e370..6c3a53f12 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE127", "name": "Route127", "layout": "LAYOUT_ROUTE127", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_127", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index da4ed9c21..a5c329c86 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE128", "name": "Route128", "layout": "LAYOUT_ROUTE128", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_128", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 7e7ae0d8b..3236a422c 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE129", "name": "Route129", "layout": "LAYOUT_ROUTE129", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_129", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 073549cd4..f6628e888 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE130", "name": "Route130", "layout": "LAYOUT_ROUTE130", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_130", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 5e166047a..4b367e9be 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE131", "name": "Route131", "layout": "LAYOUT_ROUTE131", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_131", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index e778a1341..5ded1cd04 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE132", "name": "Route132", "layout": "LAYOUT_ROUTE132", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_132", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index cf61d83d2..41808fd13 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE133", "name": "Route133", "layout": "LAYOUT_ROUTE133", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_133", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 566507ec6..ac41a0486 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE134", "name": "Route134", "layout": "LAYOUT_ROUTE134", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_134", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index c186a4149..10032c0f9 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY", "name": "RustboroCity", "layout": "LAYOUT_RUSTBORO_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index e03fbb322..e8df00e87 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", "name": "RustboroCity_CuttersHouse", "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 4ecd68663..dfbea534c 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", "name": "RustboroCity_DevonCorp_1F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 09798add6..148acbfff 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", "name": "RustboroCity_DevonCorp_2F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index ae04f9779..5974adb69 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -138,7 +138,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage @@ -158,7 +158,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 3f6033db7..0854a32e6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", "name": "RustboroCity_DevonCorp_3F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 0a2cd2117..ce25c82ac 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, MSGBOX_DEFAULT closemessage - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_18320B, MSGBOX_DEFAULT giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index 71ca8ec5b..fdb6596b9 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_1F", "name": "RustboroCity_Flat1_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 63d3aa2b2..fccd06dc3 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_2F", "name": "RustboroCity_Flat1_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 01f55b7cd..8a2161620 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_1F", "name": "RustboroCity_Flat2_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 8bd868bcd..68edab82b 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_2F", "name": "RustboroCity_Flat2_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 462f90bbe..975d37739 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_3F", "name": "RustboroCity_Flat2_3F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 95a9cca8b..82866f8a3 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_GYM", "name": "RustboroCity_Gym", "layout": "LAYOUT_RUSTBORO_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 5100c2d83..5ded523a8 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE1", "name": "RustboroCity_House1", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 282740365..7c02d3ad5 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE2", "name": "RustboroCity_House2", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index f3ee9bfcf..b2e22ae1e 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE3", "name": "RustboroCity_House3", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 389da78f2..abf13aea7 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_MART", "name": "RustboroCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 86fcd070c..71093bbe1 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", "name": "RustboroCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 5d4209a8f..ed06cae95 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", "name": "RustboroCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index cc34e9c93..6de9ec101 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", "name": "RustboroCity_PokemonSchool", "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", - "music": "MUS_P_SCHOOL", + "music": "MUS_SCHOOL", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 919abbd25..9e84d1689 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTURF_TUNNEL", "name": "RusturfTunnel", "layout": "LAYOUT_RUSTURF_TUNNEL", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_RUSTURF_TUNNEL", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 74813ed10..af7f6e177 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_CORRIDOR", "name": "SSTidalCorridor", "layout": "LAYOUT_SS_TIDAL_CORRIDOR", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 18d42f009..77ec961cb 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 2 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199007, MSGBOX_DEFAULT releaseall end @@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar VAR_PORTHOLE_STATE, 6 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT releaseall end @@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_199007, MSGBOX_DEFAULT return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_1990F8, MSGBOX_DEFAULT return @@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 3 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT releaseall end @@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_1990B4, MSGBOX_DEFAULT releaseall end @@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_1990B4, MSGBOX_DEFAULT return diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index dabe9dbbb..a80ec4a89 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_LOWER_DECK", "name": "SSTidalLowerDeck", "layout": "LAYOUT_SS_TIDAL_LOWER_DECK", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 6cdac8246..858848c1b 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_ROOMS", "name": "SSTidalRooms", "layout": "LAYOUT_SS_TIDAL_ROOMS", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 0207c6917..41964581a 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHEAST", "name": "SafariZone_Northeast", "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index fa22ddef0..8c85b5414 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHWEST", "name": "SafariZone_Northwest", "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index dc62a87e4..06c169254 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_REST_HOUSE", "name": "SafariZone_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index c99a370e5..d90635ce3 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHEAST", "name": "SafariZone_Southeast", "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index fd2d06f24..cd6b5853b 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHWEST", "name": "SafariZone_Southwest", "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 1bb82eea2..4d61d53f2 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -2,7 +2,7 @@ "id": "MAP_SCORCHED_SLAB", "name": "ScorchedSlab", "layout": "LAYOUT_SCORCHED_SLAB", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_SCORCHED_SLAB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 36b4b7c67..7051d58f3 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE", "name": "SeafloorCavern_Entrance", "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index d37a2ce20..e0ebb348c 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM1", "name": "SeafloorCavern_Room1", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index ce9722c5a..9a9c7d681 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM2", "name": "SeafloorCavern_Room2", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 06c6e6d7e..328250525 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM3", "name": "SeafloorCavern_Room3", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 2150f0cda..1f01baced 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM4", "name": "SeafloorCavern_Room4", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 73c9b2979..84c74c344 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM5", "name": "SeafloorCavern_Room5", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index a554c7531..2b22d66b5 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM6", "name": "SeafloorCavern_Room6", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 700c3107f..db9cabf64 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM7", "name": "SeafloorCavern_Room7", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index caa853d21..82f4fe3ca 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM8", "name": "SeafloorCavern_Room8", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index c9cbc6d22..406b5804d 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM9", "name": "SeafloorCavern_Room9", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 82011cbf7..3f865d5fc 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -78,7 +78,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar VAR_RESULT, 0 .endif - playse SE_W197 + playse SE_M_DETECT setfieldeffectargument 0, 16 setfieldeffectargument 1, 42 setfieldeffectargument 2, 0 @@ -89,8 +89,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar VAR_RESULT, 1 .endif - playfanfare MUS_ME_TAMA - playse SE_TAMA + playfanfare MUS_AWAKEN_LEGEND + playse SE_ORB special sub_80818A4 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp @@ -126,7 +126,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4A89, MSGBOX_DEFAULT .endif - playse SE_PC_LOGON + playse SE_PC_LOGIN applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index 585bb90d0..e49ab2067 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_INNER_ROOM", "name": "SealedChamber_InnerRoom", "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index d0f098566..a5355b77a 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -11,7 +11,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 compare VAR_RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 - playse SE_TRACK_MOVE + playse SE_TRUCK_MOVE special DoSealedChamberShakingEffect1 waitstate delay 40 diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index c2c74b930..91f541a57 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_OUTER_ROOM", "name": "SealedChamber_OuterRoom", "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 48c4ec49c..f9c796e6d 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 075ccbbfa..0d80cd4e3 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 482b3d4a3..22c577034 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index b3d6a37d4..0591aa9e2 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 1ffa76d99..edad638c9 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index f0c455fc1..189967535 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index f7ec74fed..3fdbaeedc 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index d1ae09924..4e6239506 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index c9dd337ae..cea0365cf 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index ecc21b523..a3c36c9fd 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index f038f3449..eb728dac3 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 537622c45..ea16b6dcc 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index f4980476d..862606f22 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 61a53af44..ac377ddbc 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index 5d92fe6ee..83844bcd6 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 296e63958..13b678f46 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 0e9366a6a..feccc5a26 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 92a4c9240..35c10dd5b 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index a27353ec0..7a022a1a0 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index e2de6d6c1..3a37090d9 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 0dbf8134b..3ff452fb6 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 25bcd3ea4..8181fd4dd 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index e9a9bb038..10e9e53a0 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 0c7699125..acd1151f7 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 3ae268fa1..c6ad65f54 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_HighTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index ef1f1487c..0946b1155 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", "name": "ShoalCave_HighTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 5db783bc3..e4feb3c84 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_LowTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index 3e00c17bd..5e658aab9 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", "name": "ShoalCave_LowTideIceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 53ebe6eb6..543b38a2b 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", "name": "ShoalCave_LowTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 3604ee850..159f96417 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", "name": "ShoalCave_LowTideLowerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index b5c200b45..4650d533e 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", "name": "ShoalCave_LowTideStairsRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index 47703ae02..89ae1c28e 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -2,7 +2,7 @@ "id": "MAP_SINGLE_BATTLE_COLOSSEUM", "name": "SingleBattleColosseum", "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index dc120c3b6..fae9ac22f 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_1F", "name": "SkyPillar_1F", "layout": "LAYOUT_SKY_PILLAR_1F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 9dc7b05de..c69f7018a 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_2F", "name": "SkyPillar_2F", "layout": "LAYOUT_SKY_PILLAR_2F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 712c1c490..c363754e4 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_3F", "name": "SkyPillar_3F", "layout": "LAYOUT_SKY_PILLAR_3F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index 7d25f8c81..9371a5d0e 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_4F", "name": "SkyPillar_4F", "layout": "LAYOUT_SKY_PILLAR_4F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 007456bfc..78cf86a7f 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_5F", "name": "SkyPillar_5F", "layout": "LAYOUT_SKY_PILLAR_5F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index d0d984329..538fb07c2 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_ENTRANCE", "name": "SkyPillar_Entrance", "layout": "LAYOUT_SKY_PILLAR_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 1d5b0d633..2867510c2 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_OUTSIDE", "name": "SkyPillar_Outside", "layout": "LAYOUT_SKY_PILLAR_OUTSIDE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 44854fc28..edbf2369f 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_TOP", "name": "SkyPillar_Top", "layout": "LAYOUT_SKY_PILLAR_TOP", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 9df1b3229..f1bdbac44 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY", "name": "SlateportCity", "layout": "LAYOUT_SLATEPORT_CITY", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 854462533..a3908f6f9 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -73,7 +73,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 compare VAR_RESULT, 0 call_if_eq SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message SlateportCity_Text_1646DD waitfanfare waitmessage diff --git a/data/maps/SlateportCity_ContestHall/map.json b/data/maps/SlateportCity_ContestHall/map.json index 803b35db0..40a592f97 100644 --- a/data/maps/SlateportCity_ContestHall/map.json +++ b/data/maps/SlateportCity_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_CONTEST_HALL", "name": "SlateportCity_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_ContestLobby/map.json b/data/maps/SlateportCity_ContestLobby/map.json index 44a98ea06..2814471d0 100644 --- a/data/maps/SlateportCity_ContestLobby/map.json +++ b/data/maps/SlateportCity_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_CONTEST_LOBBY", "name": "SlateportCity_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index f484e8a57..adc0c13cf 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 6a7bf3969..b189da606 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HARBOR", "name": "SlateportCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index a9b24dab5..8102fca9b 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HOUSE1", "name": "SlateportCity_House1", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index b27168eca..2766431e4 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HOUSE2", "name": "SlateportCity_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index 69e227101..bdc412416 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_MART", "name": "SlateportCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index db9aaec0f..40ce94acc 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", "name": "SlateportCity_OceanicMuseum_1F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 575a42e33..ae9a0086d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -179,7 +179,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse SE_KAIDAN + playse SE_EXIT removeobject 13 release end @@ -188,7 +188,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse SE_KAIDAN + playse SE_EXIT removeobject 13 release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index e00f2ade1..aa9183e21 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", "name": "SlateportCity_OceanicMuseum_2F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 0450d51f1..5e14d0cd2 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -84,7 +84,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closemessage applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject 1 setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index de1a16a27..8da2981e2 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", "name": "SlateportCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index b7d8799fe..f135fe7e5 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", "name": "SlateportCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index d5a39eb54..4292187fd 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", "name": "SlateportCity_PokemonFanClub", "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index b916af9ea..4c5bd47ed 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", "name": "SlateportCity_SternsShipyard_1F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index d2a35e317..bf5d31907 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", "name": "SlateportCity_SternsShipyard_2F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index e4c2d7710..4dd94cadf 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY", "name": "SootopolisCity", "layout": "LAYOUT_SOOTOPOLIS_CITY", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index e28450cd1..0416e99a4 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_1F", "name": "SootopolisCity_Gym_1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 7013df88d..38f97a3b0 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -49,7 +49,7 @@ SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -57,7 +57,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -65,7 +65,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -75,7 +75,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 delay 20 applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_15AFFD waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 9a0619421..50cc08af3 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F", "name": "SootopolisCity_Gym_B1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 8c024eca8..f4ce05680 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE1", "name": "SootopolisCity_House1", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 09ec1c06f..81aa1184c 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE2", "name": "SootopolisCity_House2", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 282e50bc4..454ab19f8 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE3", "name": "SootopolisCity_House3", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 61bbfa10b..754fe6a15 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE4", "name": "SootopolisCity_House4", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 89becb6c6..1691b2165 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE5", "name": "SootopolisCity_House5", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 19df640ce..4b3913f3d 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE6", "name": "SootopolisCity_House6", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 9ccef3f2b..b83876db7 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE7", "name": "SootopolisCity_House7", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House8/map.json b/data/maps/SootopolisCity_House8/map.json index 07ea5c5a0..c47219f7e 100644 --- a/data/maps/SootopolisCity_House8/map.json +++ b/data/maps/SootopolisCity_House8/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE8", "name": "SootopolisCity_House8", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE8", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 43ae2ca93..debe89e79 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MART", "name": "SootopolisCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 795e69cd6..91f14a7e2 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", "name": "SootopolisCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index ff92662bb..afa78b9ca 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", "name": "SootopolisCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 2a8bfd397..7749a4a27 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_EXTERIOR", "name": "SouthernIsland_Exterior", "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index c93edfe2f..7743f9ad6 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_INTERIOR", "name": "SouthernIsland_Interior", "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f31bfc8c6..7ffa58cb4 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_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index b5da6e8f3..38b125dec 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER1", "name": "Underwater1", "layout": "LAYOUT_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_124", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 19bb67c63..e743f8989 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER2", "name": "Underwater2", "layout": "LAYOUT_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_125", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 5166a403c..e5f75aa4f 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER3", "name": "Underwater3", "layout": "LAYOUT_UNDERWATER3", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_126", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index a963da647..ee97a911d 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER4", "name": "Underwater4", "layout": "LAYOUT_UNDERWATER4", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_127", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index d435556ee..5a3b00bbc 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_ROUTE134", "name": "Underwater_Route134", "layout": "LAYOUT_UNDERWATER_ROUTE134", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 6ec900a6f..59bafbac5 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN", "name": "Underwater_SeafloorCavern", "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_128", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 4a31edb43..4cc83422f 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEALED_CHAMBER", "name": "Underwater_SealedChamber", "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index 8250b2a32..fe5211040 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY", "name": "Underwater_SootopolisCity", "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json index eba4d0b48..82a084b1b 100644 --- a/data/maps/UnknownMap_25_29/map.json +++ b/data/maps/UnknownMap_25_29/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_29", "name": "UnknownMap_25_29", "layout": "LAYOUT_UNKNOWN_MAP_25_29", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json index 4a8343163..5a22fae5e 100644 --- a/data/maps/UnknownMap_25_30/map.json +++ b/data/maps/UnknownMap_25_30/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_30", "name": "UnknownMap_25_30", "layout": "LAYOUT_UNKNOWN_MAP_25_30", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json index 932a48899..b73602e9f 100644 --- a/data/maps/UnknownMap_25_31/map.json +++ b/data/maps/UnknownMap_25_31/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_31", "name": "UnknownMap_25_31", "layout": "LAYOUT_UNKNOWN_MAP_25_31", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json index 32d15dbdc..3266a2c9d 100644 --- a/data/maps/UnknownMap_25_32/map.json +++ b/data/maps/UnknownMap_25_32/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_32", "name": "UnknownMap_25_32", "layout": "LAYOUT_UNKNOWN_MAP_25_32", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json index 14d6589b6..3a6d79404 100644 --- a/data/maps/UnknownMap_25_33/map.json +++ b/data/maps/UnknownMap_25_33/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_33", "name": "UnknownMap_25_33", "layout": "LAYOUT_UNKNOWN_MAP_25_33", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json index b4d5c7bab..aec7f40a1 100644 --- a/data/maps/UnknownMap_25_34/map.json +++ b/data/maps/UnknownMap_25_34/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_34", "name": "UnknownMap_25_34", "layout": "LAYOUT_UNKNOWN_MAP_25_34", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 71f176e2b..20e6b88bf 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN", "name": "VerdanturfTown", "layout": "LAYOUT_VERDANTURF_TOWN", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VerdanturfTown_ContestHall/map.json b/data/maps/VerdanturfTown_ContestHall/map.json index 90215698b..5ef4101f6 100644 --- a/data/maps/VerdanturfTown_ContestHall/map.json +++ b/data/maps/VerdanturfTown_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_CONTEST_HALL", "name": "VerdanturfTown_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_ContestLobby/map.json b/data/maps/VerdanturfTown_ContestLobby/map.json index acd5caa8c..8907f866c 100644 --- a/data/maps/VerdanturfTown_ContestLobby/map.json +++ b/data/maps/VerdanturfTown_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_CONTEST_LOBBY", "name": "VerdanturfTown_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 8eb1c0bcd..df4139dbe 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 0d9e9113a..785a4df91 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", "name": "VerdanturfTown_FriendshipRatersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index b09e47a12..d302bb710 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_HOUSE", "name": "VerdanturfTown_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 445ea2e1e..eadc8033b 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_MART", "name": "VerdanturfTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 220aceaec..0a343727b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", "name": "VerdanturfTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index b5b8c9fef..f2657afe6 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", "name": "VerdanturfTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 3986443e2..7c4f130e0 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", "name": "VerdanturfTown_WandasHouse", "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 8c4dfb9ae..9931edd3d 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_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 2473a819f..ee15b4ffa 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B1F", "name": "VictoryRoad_B1F", "layout": "LAYOUT_VICTORY_ROAD_B1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 0a0ee1a57..87a8359bc 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B2F", "name": "VictoryRoad_B2F", "layout": "LAYOUT_VICTORY_ROAD_B2F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", |