diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2024-11-15 22:14:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-15 21:14:51 -0600 |
| commit | 5d5097c981eca32ca0a7dfe11ed2ff74e0b88a22 (patch) | |
| tree | 327cf77e4f5de11b64499a91cfd1b3bddeb46a0d /mm/src/code | |
| parent | 7dd828845171e8da5a82e6c6811d5fed85d1081e (diff) | |
Check room key flag instead of slot for Stock Pot Inn (#34)
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_schedule.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/src/code/z_schedule.c b/mm/src/code/z_schedule.c index 38bcb58c3..6b5f5ebe9 100644 --- a/mm/src/code/z_schedule.c +++ b/mm/src/code/z_schedule.c @@ -1,4 +1,5 @@ #include "global.h" +#include "2s2h/GameInteractor/GameInteractor.h" #define SCHEDULE_CALC_TIME(hour, minute, dest, temp) \ (temp) = (hour)*60.0f; \ @@ -109,7 +110,8 @@ s32 Schedule_Nop(PlayState* play, u8** script, ScheduleOutput* output) { s32 Schedule_CheckMiscS(PlayState* play, u8** script, ScheduleOutput* output) { ScheduleCmdCheckMiscS* cmd = (ScheduleCmdCheckMiscS*)*script; - if (((cmd->which == SCHEDULE_CHECK_MISC_ROOM_KEY) && (INV_CONTENT(ITEM_ROOM_KEY) == ITEM_ROOM_KEY)) || + if (((cmd->which == SCHEDULE_CHECK_MISC_ROOM_KEY) && + GameInteractor_Should(VB_CHECK_FOR_ROOM_KEY, INV_CONTENT(ITEM_ROOM_KEY) == ITEM_ROOM_KEY)) || ((cmd->which == SCHEDULE_CHECK_MISC_LETTER_TO_KAFEI) && (INV_CONTENT(ITEM_LETTER_TO_KAFEI) == ITEM_LETTER_TO_KAFEI)) || ((cmd->which == SCHEDULE_CHECK_MISC_MASK_ROMANI) && (Player_GetMask(play) == PLAYER_MASK_ROMANI))) { |