summaryrefslogtreecommitdiff
path: root/data/maps/SixIsland_PokemonCenter_1F
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/SixIsland_PokemonCenter_1F
parentc5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff)
Give songs meaningful english names
Diffstat (limited to 'data/maps/SixIsland_PokemonCenter_1F')
-rw-r--r--data/maps/SixIsland_PokemonCenter_1F/map.json2
-rw-r--r--data/maps/SixIsland_PokemonCenter_1F/scripts.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json
index 24e873369..4ddf8f3b5 100644
--- a/data/maps/SixIsland_PokemonCenter_1F/map.json
+++ b/data/maps/SixIsland_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
"id": "MAP_SIX_ISLAND_POKEMON_CENTER_1F",
"name": "SixIsland_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
- "music": "MUS_POKECEN",
+ "music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_SIX_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
index 72134595e..ff8f2c4e7 100644
--- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc
@@ -25,7 +25,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97
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
@@ -39,7 +39,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97
applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit
waitmovement 0
fadedefaultbgm
- playse SE_KAIDAN
+ playse SE_EXIT
delay 35
removeobject LOCALID_RIVAL
setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1