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/Route22 | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/maps/Route22')
| -rw-r--r-- | data/maps/Route22/map.json | 2 | ||||
| -rw-r--r-- | data/maps/Route22/scripts.inc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 5b6ea3621..c03b8068d 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22", "name": "Route22", "layout": "LAYOUT_ROUTE22", - "music": "BGM_FRLG_ROUTE_3", + "music": "MUS_LOAD02", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index a116b73eb..6df018f2f 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -29,7 +29,7 @@ EventScript_1682BD:: @ 81682BD EventScript_1682BE:: @ 81682BE textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_168350 @@ -48,7 +48,7 @@ EventScript_1682BE:: @ 81682BE msgbox gUnknown_8188974 closemessage delay 10 - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16839A compare_var_to_value VAR_0x4001, 1 @@ -195,7 +195,7 @@ EventScript_16841E:: @ 816841E EventScript_16841F:: @ 816841F textcolor 0 - playbgm BGM_FRLG_RIVAL, 0 + playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 call_if 1, EventScript_16849C @@ -214,7 +214,7 @@ EventScript_16841F:: @ 816841F msgbox gUnknown_8188B29 closemessage delay 10 - playbgm BGM_FRLG_RIVAL_POSTBATTLE, 0 + playbgm MUS_RIVAL2, 0 applymovement 1, Movement_1684DA waitmovement 0 fadedefaultbgm |