diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-24 19:57:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-24 16:57:36 -0800 |
| commit | 229527daf71c76965ef0735abca530cee68b7358 (patch) | |
| tree | 0325055c01866d359b1556a2cbc6b65cbd238466 /src/d/d_s_room.cpp | |
| parent | cefe919b8d39cb5b60d79b1dc7452e80abdf9657 (diff) | |
Resolve all gameInfo fakematches (#2995)
* Clean up various inlines/fakematches/comments
* Copy OptRuby inline name from TWW debug
* Resolve all dEvt_control_c related fakematches, return pointer instead of reference
* Fix some more missing inline usages
Diffstat (limited to 'src/d/d_s_room.cpp')
| -rw-r--r-- | src/d/d_s_room.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index d74a86ab9a..9c4bb22f2d 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -225,9 +225,8 @@ static bool objectSetCheck(room_of_scene_class* i_this) { static int dScnRoom_Execute(room_of_scene_class* i_this) { int roomNo = fopScnM_GetParam(i_this); - u32 flag = g_dComIfG_gameInfo.play.getRoomControl()->mStatus[roomNo].mFlag; - if (flag & 2) { - dComIfGp_roomControl_setStatusFlag(roomNo, flag & ~2); + if (dComIfGp_roomControl_checkStatusFlag(roomNo, 2)) { + dComIfGp_roomControl_offStatusFlag(roomNo, 2); dComIfGp_roomControl_onStatusFlag(roomNo, 1); } else if (objectSetCheck(i_this)) { if (dComIfGp_roomControl_checkStatusFlag(roomNo, 4)) { |