diff options
author | hondew <pokehondew@gmail.com> | 2020-08-30 14:14:38 -0400 |
---|---|---|
committer | hondew <pokehondew@gmail.com> | 2020-08-30 14:14:38 -0400 |
commit | e46b35455d1e2af8c8c2d291ce1cc28e682d9095 (patch) | |
tree | 76855f3dedad94ba34a8f8b40811a1005107b5ae /data/maps/Route110/scripts.inc | |
parent | 328aecc96e690c437e52663a1445417e8aa78df6 (diff) | |
parent | a9719c92bfa4c6b6dcf57e9516f184721152ad80 (diff) |
Merge branch 'master' into pokeball-doc
Diffstat (limited to 'data/maps/Route110/scripts.inc')
-rw-r--r-- | data/maps/Route110/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 02c13f4d9..50f3d1f48 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -410,11 +410,11 @@ Route110_EventScript_RivalScene:: @ 81EF76E end Route110_EventScript_PlayMayMusic:: @ 81EF7E1 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return Route110_EventScript_PlayBrendanMusic:: @ 81EF7E6 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return Route110_EventScript_MayBattle:: @ 81EF7EB @@ -448,7 +448,7 @@ Route110_EventScript_MayDefeated:: @ 81EF84A end Route110_EventScript_BrendanBattle:: @ 81EF865 - msgbox Route110_Text_BrendayLetsBattle, MSGBOX_DEFAULT + msgbox Route110_Text_BrendanLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route110_EventScript_BrendanBattleTreecko case 1, Route110_EventScript_BrendanBattleTorchic @@ -648,7 +648,7 @@ Route110_EventScript_BirchScene:: @ 81EF9F7 msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route110_Text_RegisteredBirchInPokenav, MSGBOX_DEFAULT waitfanfare closemessage @@ -814,7 +814,7 @@ Route110_Text_MayExplainItemfinder: @ 81EFD58 .string "me, but I think you should train a lot\l" .string "harder for the next time.$" -Route110_Text_BrendayLetsBattle: @ 81EFE3F +Route110_Text_BrendanLetsBattle: @ 81EFE3F .string "BRENDAN: Hey, {PLAYER}.\n" .string "So this is where you were.\l" .string "How's it going?\p" |