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

jpn match

Browse Source
This commit is contained in:
Trueffeloot
2023-09-13 21:05:48 +02:00
parent db20fa01a0
commit 3347d15277
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_tag_kb_item.cpp
+12 -9
View File
@@ -32,12 +32,11 @@ public:
/* 00000078-000000C8 .text _delete__13daTagKbItem_cFv */
bool daTagKbItem_c::_delete() {
#if VERSION != VERSION_JP
if (field_0x2a0 != 0xff && field_0x2a4 != 0xff) {
/* fopAcM_GetHomeRoomNo causes regalloc inside i_fopAcM_offSwitch */
// i_fopAcM_offSwitch(this, field_0x2a4);
g_dComIfG_gameInfo.save.offSwitch(field_0x2a4, orig.roomNo);
dComIfGs_offSwitch(field_0x2a4, orig.roomNo);
}
#endif
return 1;
}
@@ -58,11 +57,8 @@ int daTagKbItem_c::_create() {
fopAcM_SetupActor(this, daTagKbItem_c);
CreateInit();
// same regalloc issues
// if (field_0x29c != 0x1f && fopAcM_isItem(this, field_0x29c) || field_0x2a4 != 0xff &&
// i_fopAcM_isSwitch(this, field_0x2a4))
if (field_0x29c != 0x1f && g_dComIfG_gameInfo.save.isItem(field_0x29c, orig.roomNo) ||
field_0x2a4 != 0xff && g_dComIfG_gameInfo.save.isSwitch(field_0x2a4, orig.roomNo))
if (field_0x29c != 0x1f && dComIfGs_isItem(field_0x29c, orig.roomNo) ||
field_0x2a4 != 0xff && dComIfGs_isSwitch(field_0x2a4, orig.roomNo))
{
return cPhs_ERROR_e;
}
@@ -71,6 +67,13 @@ int daTagKbItem_c::_create() {
/* 000001BC-000001C4 .text _execute__13daTagKbItem_cFv */
bool daTagKbItem_c::_execute() {
#if VERSION == VERSION_JP
if (field_0x29c != 0x1f && dComIfGs_isItem(field_0x29c, orig.roomNo) ||
field_0x2a4 != 0xff && dComIfGs_isSwitch(field_0x2a4, orig.roomNo))
{
fopAcM_delete(this);
}
#endif
return 1;
}