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/Route104/scripts.inc | |
| parent | 328aecc96e690c437e52663a1445417e8aa78df6 (diff) | |
| parent | a9719c92bfa4c6b6dcf57e9516f184721152ad80 (diff) | |
Merge branch 'master' into pokeball-doc
Diffstat (limited to 'data/maps/Route104/scripts.inc')
| -rw-r--r-- | data/maps/Route104/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index ff9003887..d1faca53a 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -84,11 +84,11 @@ Route104_EventScript_PlayRivalMusic:: @ 81ECD11 return Route104_EventScript_PlayMayMusic:: @ 81ECD29 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return Route104_EventScript_PlayBrendanMusic:: @ 81ECD2E - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return Route104_EventScript_RivalEncounter:: @ 81ECD33 @@ -106,7 +106,7 @@ Route104_EventScript_MayEncounter:: @ 81ECD4B msgbox Route104_Text_MayWeShouldRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredMay, MSGBOX_DEFAULT waitfanfare closemessage @@ -195,7 +195,7 @@ Route104_EventScript_BrendanEncounter:: @ 81ECE6F msgbox Route104_Text_BrendanWeShouldRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredBrendan, MSGBOX_DEFAULT waitfanfare closemessage @@ -387,7 +387,7 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF pokenavcall Route104_Text_DadPokenavCall waitmessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredDadInPokenav, MSGBOX_DEFAULT waitfanfare closemessage |