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

Merge branch 'lighting' into lighting-expanded-id

Browse Source
This commit is contained in:
Ariel A 2024-02-17 18:01:21 -05:00
commit a37f633337
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/event_object_movement.c
View File

@ -2272,9 +2272,8 @@ bool32 CheckMsgCondition(const struct MsgCondition *cond, struct Pokemon *mon, u
return (multi == cond->data.bytes[0] || multi == cond->data.bytes[1]);
case MSG_COND_MUSIC:
return (cond->data.raw == GetCurrentMapMusic());
// Added on `lighting` branch
// case MSG_COND_TIME_OF_DAY:
// break;
case MSG_COND_TIME_OF_DAY:
return (cond->data.raw == gTimeOfDay);
case MSG_COND_NEAR_MB:
multi = FindMetatileBehaviorWithinRange(
obj->currentCoords.x, obj->currentCoords.y,

6
src/follower_helper.c
View File

@ -287,17 +287,15 @@ const struct FollowerMsgInfoExtended gFollowerConditionalMessages[COND_MSG_COUNT
{
.text = (u8*)sDayTexts,
.textSpread = 1,
.wt = {.timeOfDay = TIME_OF_DAY_DAY},
.wtFlags = 3, // time
.emotion = FOLLOWER_EMOTION_MUSIC,
.conditions = {MATCH_TIME_OF_DAY(TIME_OF_DAY_DAY)},
},
[COND_MSG_NIGHT] =
{
.text = (u8*)sNightTexts,
.textSpread = 1,
.wt = {.timeOfDay = TIME_OF_DAY_NIGHT},
.wtFlags = 3, // time
.emotion = FOLLOWER_EMOTION_MUSIC,
.conditions = {MATCH_TIME_OF_DAY(TIME_OF_DAY_NIGHT)},
},
};