Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made MSG_COND_TIME_OF_DAY clearer

Browse Source
This commit is contained in:
Eduardo Quezada 2025-01-17 20:07:48 -03:00
parent 937b3106b4
commit 070f9ce4e1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/event_object_movement.c
View File

@ -2391,9 +2391,14 @@ bool32 CheckMsgCondition(const struct MsgCondition *cond, struct Pokemon *mon, u
case MSG_COND_MUSIC:
return (cond->data.raw == GetCurrentMapMusic());
case MSG_COND_TIME_OF_DAY:
{
// Must match time of day, have natural light on the map,
// and not have weather that obscures the sky
return (cond->data.raw == gTimeOfDay && MapHasNaturalLight(gMapHeader.mapType) && GetCurrentWeather() < WEATHER_RAIN);
u32 weather = GetCurrentWeather();
return (cond->data.raw == gTimeOfDay
&& MapHasNaturalLight(gMapHeader.mapType)
&& (weather == WEATHER_NONE || weather == WEATHER_SUNNY_CLOUDS || weather == WEATHER_SUNNY));
}
case MSG_COND_NEAR_MB:
multi = FindMetatileBehaviorWithinRange(obj->currentCoords.x,
obj->currentCoords.y,