mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 22:11:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix obj_movebox parameter inlines

Browse Source 
fixes #781
This commit is contained in:
LagoLunatic
2025-06-02 00:30:37 -04:00
parent 4e7f5de0f3
commit 073df83073
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_movebox.h
+6 -6
View File
@@ -144,11 +144,8 @@ namespace daObjMovebox {
PRM_TYPE_W = 0x04,
PRM_TYPE_S = 0x18,
PRM_SWSAVE_W = 0x01,
PRM_SWSAVE_S = 0x1E,
PRM_SWSAVE1_W = 0x08,
PRM_SWSAVE1_S = 0x08,
PRM_SWSAVE_W = 0x08,
PRM_SWSAVE_S = 0x08,
PRM_ITEMNO_W = 0x06,
PRM_ITEMNO_S = 0x00,
@@ -156,6 +153,9 @@ namespace daObjMovebox {
PRM_ITEMSAVE_W = 0x07,
PRM_ITEMSAVE_S = 0x10,
PRM_DMY_W = 0x01,
PRM_DMY_S = 0x1E,
PRM_BUOY_W = 0x01,
PRM_BUOY_S = 0x1F,
};
@@ -174,8 +174,8 @@ namespace daObjMovebox {
s32 prmX_get_evId() const { return (mPrmX & 0x00FF) >> 0; }
s32 prm_get_itemNo() const { return daObj::PrmAbstract(this, PRM_ITEMNO_W, PRM_ITEMNO_S); }
s32 prm_get_itemSave() const { return daObj::PrmAbstract(this, PRM_ITEMSAVE_W, PRM_ITEMSAVE_S); }
s32 prm_get_dmy() const { return daObj::PrmAbstract(this, PRM_DMY_W, PRM_DMY_S); }
s32 prm_get_buoy() const { return daObj::PrmAbstract(this, PRM_BUOY_W, PRM_BUOY_S); }
s32 prm_get_dmy() const; // Unused?
BOOL is_switch1() const { return fopAcM_isSwitch(const_cast<Act_c*>(this), prm_get_swSave1()); };
BOOL is_switch2() const { return fopAcM_isSwitch(const_cast<Act_c*>(this), prmZ_get_swSave2()); };
src/d/actor/d_a_obj_movebox.cpp
+3 -3
View File
@@ -1016,7 +1016,7 @@ namespace daObjMovebox {
/* 000012E0-00001308 .text prm_get_swSave1__Q212daObjMovebox5Act_cCFv */
s32 Act_c::prm_get_swSave1() const {
return daObj::PrmAbstract(this, PRM_SWSAVE1_W, PRM_SWSAVE1_S);
return prm_get_swSave();
}
/* 00001308-00001380 .text prmZ_init__Q212daObjMovebox5Act_cFv */
@@ -1026,7 +1026,7 @@ namespace daObjMovebox {
}
mbPrmZInitialized = true;
s32 switchEnablesSpawn = prm_get_swSave();
s32 switchEnablesSpawn = prm_get_dmy();
if (switchEnablesSpawn) {
// The appearing/disappearing type of box does not take pathId or swSave2 params.
mPrmZ = 0xFFFF;
@@ -1484,7 +1484,7 @@ namespace daObjMovebox {
}
bool switchIsSet = is_switch1();
bool switchEnablesSpawn = prm_get_swSave();
bool switchEnablesSpawn = prm_get_dmy();
bool shouldAppear = false;
if ((!switchIsSet && !switchEnablesSpawn) || (switchIsSet && switchEnablesSpawn)) {
shouldAppear = true;