diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /data/scripts/maps/BattleFrontier_ReceptionGate.inc | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/BattleFrontier_ReceptionGate.inc')
| -rw-r--r-- | data/scripts/maps/BattleFrontier_ReceptionGate.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc index 1448904d8..7ecf83788 100644 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc @@ -29,7 +29,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message BattleFrontier_ReceptionGate_Text_266676 waitfanfare waitmessage |