mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-14 04:23:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use "switch no" instead of "switch id/index"

Browse Source
This commit is contained in:
LagoLunatic
2025-02-27 18:14:50 -05:00
parent f2264eea7c
commit c61fe4a335
9 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_kytag03.cpp
+5 -5
View File
@@ -50,8 +50,8 @@ static BOOL daKytag03_Execute(kytag03_class* i_this) {
if (!dComIfGp_event_runCheck() || !dComIfGp_event_chkEventFlag(dEvtFlag_STAFF_ALL_e)) {
if (i_this->tevStr.mRoomNo == dStage_roomControl_c::getStayNo()) {
i_this->mbRoomActive = true;
if (i_this->mSwitchID != 0xFF) {
if (dComIfGs_isSwitch(i_this->mSwitchID, dStage_roomControl_c::getStayNo())) {
if (i_this->mSwitchNo != 0xFF) {
if (dComIfGs_isSwitch(i_this->mSwitchNo, dStage_roomControl_c::getStayNo())) {
if (!dKy_contrast_flg_get()) {
dKy_contrast_flg_set(true);
dKy_change_colpat(4);
@@ -70,8 +70,8 @@ static BOOL daKytag03_Execute(kytag03_class* i_this) {
}
} else if (!i_this->mbRoomActive) {
if (i_this->tevStr.mRoomNo != dStage_roomControl_c::getStayNo()) {
if (i_this->mSwitchID != 0xFF) {
if (dComIfGs_isSwitch(i_this->mSwitchID, i_this->tevStr.mRoomNo)) {
if (i_this->mSwitchNo != 0xFF) {
if (dComIfGs_isSwitch(i_this->mSwitchNo, i_this->tevStr.mRoomNo)) {
if (!dKy_contrast_flg_get()) {
dKy_contrast_flg_set(true);
dKy_change_colpat(4);
@@ -135,7 +135,7 @@ static s32 daKytag03_Create(fopAc_ac_c* i_ac) {
i_this->field_0x2a0 = 0;
i_this->field_0x2a8 = 0.0f;
i_this->mSwitchID = fopAcM_GetParam(i_this);
i_this->mSwitchNo = fopAcM_GetParam(i_this);
i_this->mbRoomActive = false;
i_this->mbIsActive = false;
i_this->mbVisible = false;
src/d/actor/d_a_wall.cpp
+6 -6
View File
@@ -132,7 +132,7 @@ void daWall_c::CreateInit() {
dComIfG_Bgsp()->Regist(mpBgW, this);
set_mtx();
mpBgW->Move();
mSwitchIndex = fopAcM_GetParam(this) & 0xFF;
mSwitchNo = fopAcM_GetParam(this) & 0xFF;
mState = false;
}
@@ -140,9 +140,9 @@ void daWall_c::CreateInit() {
s32 daWall_c::_create() {
fopAcM_SetupActor(this, daWall_c);
mType = fopAcM_GetParam(this) >> 8;
mSwitchIndex = fopAcM_GetParam(this) & 0xFF;
bool isSwitch = dComIfGs_isSwitch(mSwitchIndex, fopAcM_GetHomeRoomNo(this));
if (isSwitch || mSwitchIndex == 0xff) {
mSwitchNo = fopAcM_GetParam(this) & 0xFF;
bool isSwitch = dComIfGs_isSwitch(mSwitchNo, fopAcM_GetHomeRoomNo(this));
if (isSwitch || mSwitchNo == 0xff) {
return cPhs_ERROR_e;
}
@@ -293,8 +293,8 @@ void daWall_c::set_effect() {
mBreakCounter = 1;
mState = 1;
dComIfG_Bgsp()->Release(mpBgW);
if (mSwitchIndex != 0xFF)
dComIfGs_onSwitch(mSwitchIndex, fopAcM_GetHomeRoomNo(this));
if (mSwitchNo != 0xFF)
dComIfGs_onSwitch(mSwitchNo, fopAcM_GetHomeRoomNo(this));
}
/* 00000F74-00000FE4 .text set_se__8daWall_cFv */