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/PokemonTower_2F | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
Give songs meaningful english names
Diffstat (limited to 'data/maps/PokemonTower_2F')
| -rw-r--r-- | data/maps/PokemonTower_2F/map.json | 2 | ||||
| -rw-r--r-- | data/maps/PokemonTower_2F/scripts.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 527af409c..36281aa79 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_2F", "name": "PokemonTower_2F", "layout": "LAYOUT_POKEMON_TOWER_2F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 0042290c1..20cbe6090 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -19,7 +19,7 @@ PokemonTower_2F_EventScript_RivalTriggerDown:: @ 816329B PokemonTower_2F_EventScript_Rival:: @ 81632A7 textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 compare VAR_TEMP_1, 0 call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight compare VAR_TEMP_1, 1 @@ -38,12 +38,12 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 call_if_eq PokemonTower_2F_EventScript_RivalCharmander msgbox PokemonTower_2F_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq PokemonTower_2F_EventScript_RivalExitRight compare VAR_TEMP_1, 1 call_if_eq PokemonTower_2F_EventScript_RivalExitDown - playse SE_KAIDAN + playse SE_EXIT delay 25 fadedefaultbgm removeobject 1 |