summaryrefslogtreecommitdiff
path: root/data/maps/CinnabarIsland
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/CinnabarIsland
parentc5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff)
Give songs meaningful english names
Diffstat (limited to 'data/maps/CinnabarIsland')
-rw-r--r--data/maps/CinnabarIsland/map.json2
-rw-r--r--data/maps/CinnabarIsland/scripts.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json
index c738cff3b..9798a6be3 100644
--- a/data/maps/CinnabarIsland/map.json
+++ b/data/maps/CinnabarIsland/map.json
@@ -2,7 +2,7 @@
"id": "MAP_CINNABAR_ISLAND",
"name": "CinnabarIsland",
"layout": "LAYOUT_CINNABAR_ISLAND",
- "music": "MUS_GUREN",
+ "music": "MUS_CINNABAR",
"region_map_section": "MAPSEC_CINNABAR_ISLAND",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc
index 40e8288cd..179c06a51 100644
--- a/data/maps/CinnabarIsland/scripts.inc
+++ b/data/maps/CinnabarIsland/scripts.inc
@@ -18,7 +18,7 @@ CinnabarIsland_OnTransition:: @ 8166EE1
end
CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B
- savebgm MUS_ANNAI
+ savebgm MUS_FOLLOW_ME
setflag FLAG_TEMP_2
setobjectxyperm LOCALID_BILL, 15, 12
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT