diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:34:28 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:39:00 +0800 |
| commit | 89a377cdd3a24956ff549b0fa69a5a1cc26fe128 (patch) | |
| tree | a5279d2d7224d04f5e39b213d4c18deda54a438e /data/maps/PowerPlant | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/maps/PowerPlant')
| -rw-r--r-- | data/maps/PowerPlant/map.json | 2 | ||||
| -rw-r--r-- | data/maps/PowerPlant/scripts.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 21ffe2703..8647b0ae1 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -2,7 +2,7 @@ "id": "MAP_POWER_PLANT", "name": "PowerPlant", "layout": "LAYOUT_POWER_PLANT", - "music": "BGM_FRLG_POKEMON_MANSION", + "music": "MUS_POKEYASHI", "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index cb9b3acdc..b70dc0f22 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -51,7 +51,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 waitmessage waitmoncry delay 10 - playbgm BGM_FRLG_LEADER_EYE, 0 + playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_0x807 special sub_807F9D8 |