Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

This commit is contained in:
ultima-soul committed 2021-06-07 12:00:23 -07:00
commit 092f02f119
104 files changed
+1272 -849

No files matched your search

+1 -1
View File
@@ -737,7 +737,7 @@ EventScript_RegionMap:: @ 827208F
Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0
setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_SAILING, 0
playbgm MUS_SAILING, FALSE
return
Common_EventScript_StopBrineysBoatMusic:: @ 82720A8