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/event_scripts.s | |
| parent | 328aecc96e690c437e52663a1445417e8aa78df6 (diff) | |
| parent | a9719c92bfa4c6b6dcf57e9516f184721152ad80 (diff) | |
Merge branch 'master' into pokeball-doc
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 7cc5960d4..f8348d0b0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -40,6 +40,7 @@ #include "constants/moves.h" #include "constants/party_menu.h" #include "constants/pokemon.h" +#include "constants/roulette.h" #include "constants/script_menu.h" #include "constants/secret_bases.h" #include "constants/songs.h" @@ -712,13 +713,13 @@ Common_EventScript_SetAbnormalWeather:: @ 827207A return Common_EventScript_PlayGymBadgeFanfare:: @ 827207E - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE waitfanfare return Common_EventScript_OutOfCenterPartyHeal:: @ 8272083 fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty fadescreen FADE_FROM_BLACK @@ -735,7 +736,7 @@ EventScript_RegionMap:: @ 827208F Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0 setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_M_BOAT, 0 + playbgm MUS_SAILING, 0 return Common_EventScript_StopBrineysBoatMusic:: @ 82720A8 @@ -819,7 +820,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 82723DD Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4 bufferitemname 0, VAR_0x8004 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message gText_PlayerHandedOverTheItem waitmessage waitfanfare |