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/SilphCo_7F | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
Give songs meaningful english names
Diffstat (limited to 'data/maps/SilphCo_7F')
| -rw-r--r-- | data/maps/SilphCo_7F/map.json | 2 | ||||
| -rw-r--r-- | data/maps/SilphCo_7F/scripts.inc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 2857c0a7a..2257544b7 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_7F", "name": "SilphCo_7F", "layout": "LAYOUT_SILPH_CO_7F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 0bfac0151..c43c8bad1 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -32,7 +32,7 @@ SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 SilphCo_7F_EventScript_RivalScene:: @ 81619D4 textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown @@ -53,12 +53,12 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 call_if_eq SilphCo_7F_EventScript_RivalCharmander msgbox SilphCo_7F_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq SilphCo_7F_EventScript_RivalExitTop compare VAR_TEMP_1, 1 call_if_eq SilphCo_7F_EventScript_RivalExitBottom - playse SE_TK_WARPIN + playse SE_WARP_IN fadedefaultbgm removeobject 1 waitse @@ -138,7 +138,7 @@ SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8 SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare @@ -153,7 +153,7 @@ SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare |