dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document easy chat

Browse Source
This commit is contained in:
GriffinR
2021-02-22 12:12:35 -05:00
parent 1cac608dbe
commit c6141fea83
36 changed files with 3056 additions and 2787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overworld.c
+2 -2
View File
@@ -1133,7 +1133,7 @@ void Overworld_PlaySpecialMapMusic(void)
{
u16 music = GetCurrLocationDefaultMusic();
if (music != MUS_ABNORMAL_WEATHER && music != 0xFFFF)
if (music != MUS_ABNORMAL_WEATHER && music != MUS_NONE)
{
if (gSaveBlock1Ptr->savedMusic)
music = gSaveBlock1Ptr->savedMusic;
@@ -1163,7 +1163,7 @@ static void TransitionMapMusic(void)
{
u16 newMusic = GetWarpDestinationMusic();
u16 currentMusic = GetCurrentMapMusic();
if (newMusic != MUS_ABNORMAL_WEATHER && newMusic != 0xFFFF)
if (newMusic != MUS_ABNORMAL_WEATHER && newMusic != MUS_NONE)
{
if (currentMusic == MUS_UNDERWATER || currentMusic == MUS_SURF)
return;