diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:16:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:16:00 -0400 |
| commit | c8307317344f0ca6d176882cf8b55d3bf82dc680 (patch) | |
| tree | 393b23af98581a7dec2e0731732a23ece4b23007 /data/maps/BattleFrontier_ReceptionGate | |
| parent | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-blender
Diffstat (limited to 'data/maps/BattleFrontier_ReceptionGate')
| -rw-r--r-- | data/maps/BattleFrontier_ReceptionGate/map.json | 2 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_ReceptionGate/scripts.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index 59f7862dc..44c71ccd1 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", "name": "BattleFrontier_ReceptionGate", "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 495ad165f..28f53de08 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -33,7 +33,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3 BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass waitfanfare waitmessage |