mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 13:45:14 -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_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 */