diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-10-07 23:38:54 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-10-07 23:38:54 -0400 |
| commit | 40a4d0a1d902ccfedf34cb155f13cab672a10555 (patch) | |
| tree | bc4f837e647b1c911501cdb963f6db45b86d81d9 /src/d/actor/d_a_agb.cpp | |
| parent | 43d5aaa0e8781353344a3703e1496680f0ecc4fb (diff) | |
stag inlines and cleanup
Diffstat (limited to 'src/d/actor/d_a_agb.cpp')
| -rw-r--r-- | src/d/actor/d_a_agb.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 605722e9..bd01b203 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -797,20 +797,20 @@ void daAgb_c::FlagsRecv() { /* 800D0978-800D0A54 .text SwitchOn__7daAgb_cFv */ void daAgb_c::SwitchOn() { - if (mSwitch.field_0x1 == (u8)dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) { + if (mSwitch.stageNo == (u8)dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo())) { u8 var_r31 = mSwitch.field_0x3 - 1; if (mSwitch.field_0x0 != 0xFF) { - dComIfGs_revSwitch(mSwitch.field_0x0, mSwitch.field_0x2); + dComIfGs_revSwitch(mSwitch.field_0x0, mSwitch.roomNo); } if (var_r31 != 9) { u8 sw = mSwitch.field_0x4; if (sw != 0xFF) { - if (var_r31 <= 1 || var_r31 == 8) { - dComIfGs_onSwitch(sw, mSwitch.field_0x2); + if (var_r31 == 0 || var_r31 == 1 || var_r31 == 8) { + dComIfGs_onSwitch(sw, mSwitch.roomNo); } else { - dComIfGs_revSwitch(sw, mSwitch.field_0x2); + dComIfGs_revSwitch(sw, mSwitch.roomNo); } } } |