summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattlePyramidLobby
diff options
context:
space:
mode:
authorhondew <pokehondew@gmail.com>2020-08-30 14:14:38 -0400
committerhondew <pokehondew@gmail.com>2020-08-30 14:14:38 -0400
commite46b35455d1e2af8c8c2d291ce1cc28e682d9095 (patch)
tree76855f3dedad94ba34a8f8b40811a1005107b5ae /data/maps/BattleFrontier_BattlePyramidLobby
parent328aecc96e690c437e52663a1445417e8aa78df6 (diff)
parenta9719c92bfa4c6b6dcf57e9516f184721152ad80 (diff)
Merge branch 'master' into pokeball-doc
Diffstat (limited to 'data/maps/BattleFrontier_BattlePyramidLobby')
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/map.json2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json
index 98b62f580..56736628f 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json
@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
"name": "BattleFrontier_BattlePyramidLobby",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
- "music": "MUS_PYRAMID",
+ "music": "MUS_B_PYRAMID",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 6c17ca02a..fc33a8c91 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -32,7 +32,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768
lockall
message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag
waitmessage
- playse SE_EXPMAX
+ playse SE_EXP_MAX
waitse
closemessage
pyramid_set PYRAMID_DATA_WIN_STREAK, 0
@@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA
special HealPlayerParty
message BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept
waitmessage
- playse SE_EXPMAX
+ playse SE_EXP_MAX
waitse
msgbox BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints, MSGBOX_DEFAULT
frontier_givepoints
@@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852
lockall
message BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag
waitmessage
- playse SE_EXPMAX
+ playse SE_EXP_MAX
waitse
message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait
waitmessage
@@ -388,7 +388,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94
BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag
waitmessage
- playse SE_EXPMAX
+ playse SE_EXP_MAX
waitse
msgbox BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel, MSGBOX_DEFAULT
closemessage