mirror of
https://github.com/pret/pokeemerald.git
synced 2026-03-21 17:54:57 -05:00
commit
76463dac15
|
|
@ -1040,7 +1040,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool16 NoMusicInSotopolisWithLegendaries(struct WarpData *warp)
|
static bool16 NoMusicInSootopolisWithLegendaries(struct WarpData *warp)
|
||||||
{
|
{
|
||||||
if (VarGet(VAR_SKY_PILLAR_STATE) != 1)
|
if (VarGet(VAR_SKY_PILLAR_STATE) != 1)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
@ -1065,7 +1065,7 @@ static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool16 IsInflitratedSpaceCenter(struct WarpData *warp)
|
static bool16 IsInfiltratedSpaceCenter(struct WarpData *warp)
|
||||||
{
|
{
|
||||||
if (VarGet(VAR_MOSSDEEP_CITY_STATE) == 0)
|
if (VarGet(VAR_MOSSDEEP_CITY_STATE) == 0)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
@ -1081,11 +1081,11 @@ static bool16 IsInflitratedSpaceCenter(struct WarpData *warp)
|
||||||
|
|
||||||
u16 GetLocationMusic(struct WarpData *warp)
|
u16 GetLocationMusic(struct WarpData *warp)
|
||||||
{
|
{
|
||||||
if (NoMusicInSotopolisWithLegendaries(warp) == TRUE)
|
if (NoMusicInSootopolisWithLegendaries(warp) == TRUE)
|
||||||
return MUS_NONE;
|
return MUS_NONE;
|
||||||
else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
|
else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
|
||||||
return MUS_ABNORMAL_WEATHER;
|
return MUS_ABNORMAL_WEATHER;
|
||||||
else if (IsInflitratedSpaceCenter(warp) == TRUE)
|
else if (IsInfiltratedSpaceCenter(warp) == TRUE)
|
||||||
return MUS_ENCOUNTER_MAGMA;
|
return MUS_ENCOUNTER_MAGMA;
|
||||||
else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
|
else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
|
||||||
return MUS_MT_CHIMNEY;
|
return MUS_MT_CHIMNEY;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user