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/ThreeIsland | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/maps/ThreeIsland')
| -rw-r--r-- | data/maps/ThreeIsland/map.json | 2 | ||||
| -rw-r--r-- | data/maps/ThreeIsland/scripts.inc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 8e45d33fc..635f1a356 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND", "name": "ThreeIsland", "layout": "LAYOUT_THREE_ISLAND", - "music": "BGM_FRLG_ISLAND_ONE", + "music": "MUS_NANA123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 4d6773491..39a3688fe 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -221,7 +221,7 @@ EventScript_167A59:: @ 8167A59 waitmovement 0 applymovement 5, Movement_167C57 waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_167C35 @@ -234,7 +234,7 @@ EventScript_167A59:: @ 8167A59 closemessage applymovement 7, Movement_167C57 waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81824EF setvar VAR_LAST_TALKED, 7 trainerbattle 3, 528, 0, Text_182521 @@ -244,7 +244,7 @@ EventScript_167A59:: @ 8167A59 closemessage applymovement 4, Movement_167C57 waitmovement 0 - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 trainerbattle 3, 529, 0, Text_1825D4 @@ -266,7 +266,7 @@ EventScript_167A59:: @ 8167A59 call_if 1, EventScript_167C03 compare_var_to_value VAR_0x4001, 4 call_if 1, EventScript_167C1C - playbgm BGM_FRLG_BOY_EYE, 0 + playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 trainerbattle 3, 742, 0, Text_1826B7 |