summaryrefslogtreecommitdiff
path: root/data/maps/SSAnne_CaptainsOffice
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-29 03:11:03 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-29 03:11:03 -0400
commitbb56d4a3f4cab33f899646e0630282fc6176a9c9 (patch)
treecb094078122b217fc67e2285614b79c6e83eaf88 /data/maps/SSAnne_CaptainsOffice
parentc5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff)
Give songs meaningful english names
Diffstat (limited to 'data/maps/SSAnne_CaptainsOffice')
-rw-r--r--data/maps/SSAnne_CaptainsOffice/map.json2
-rw-r--r--data/maps/SSAnne_CaptainsOffice/scripts.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json
index d0af547d9..ffd6cc1ec 100644
--- a/data/maps/SSAnne_CaptainsOffice/map.json
+++ b/data/maps/SSAnne_CaptainsOffice/map.json
@@ -2,7 +2,7 @@
"id": "MAP_SSANNE_CAPTAINS_OFFICE",
"name": "SSAnne_CaptainsOffice",
"layout": "LAYOUT_SSANNE_CAPTAINS_OFFICE",
- "music": "MUS_SANTOAN",
+ "music": "MUS_SS_ANNE",
"region_map_section": "MAPSEC_S_S_ANNE",
"requires_flash": false,
"weather": "WEATHER_NONE",
diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc
index 3ccd4fa51..8b89783e9 100644
--- a/data/maps/SSAnne_CaptainsOffice/scripts.inc
+++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc
@@ -8,14 +8,14 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A
textcolor 3
message SSAnne_CaptainsOffice_Text_RubbedCaptainsBack
waitmessage
- playfanfare MUS_ME_ASA
+ playfanfare MUS_HEAL
waitfanfare
call EventScript_RestorePrevTextColor
delay 50
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut
- giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_FAN5
+ giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM
msgbox SSAnne_CaptainsOffice_Text_ExplainCut
setflag FLAG_GOT_HM01
setvar VAR_MAP_SCENE_VERMILION_CITY, 1