diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 03:11:03 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 03:11:03 -0400 |
| commit | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /data/maps/FourIsland | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
Give songs meaningful english names
Diffstat (limited to 'data/maps/FourIsland')
| -rw-r--r-- | data/maps/FourIsland/map.json | 2 | ||||
| -rw-r--r-- | data/maps/FourIsland/scripts.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 1c0b06c83..33abf1091 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND", "name": "FourIsland", "layout": "LAYOUT_FOUR_ISLAND", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index ac670db55..8fbf028fc 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -32,7 +32,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_RIVAL, Movement_Delay48 @@ -46,7 +46,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit waitmovement 0 fadedefaultbgm - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 @@ -113,7 +113,7 @@ FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB textcolor 3 message DayCare_Text_ReceivedEgg call EventScript_RestorePrevTextColor - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress msgbox DayCare_Text_TakeGoodCareOfIt |