mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-06 11:47:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

dSv_info_c::isSwitch OK

Browse Source
This commit is contained in:
Pheenoh
2021-01-03 03:51:44 -05:00
parent 47c40cce41
commit 777bf2d3eb
4 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_save/d_save.cpp
+19 -8
View File
@@ -1384,24 +1384,30 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) {
}
// doesn't like getZoneBit() returning a reference
#ifdef NONMATCHING
#ifndef NONMATCHING
BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const {
int value;
if ((i_no == -1) || (i_no == 0xFF)) {
return false;
return FALSE;
}
if (i_no < 0x80) {
return this->memory.getTempFlags().isSwitch(i_no);
value = this->memory.getTempFlagsConst().isSwitch(i_no);
} else if (i_no < 0xc0) {
return this->dungeon_bit.isSwitch(i_no - 0x80);
value = this->dungeon_bit.isSwitch(i_no - 0x80);
} else {
int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_no);
if (i_no < 0xE0) {
return this->zones[zoneId].getZoneBit().isSwitch(i_no - 0xC0);
if ((zoneId < 0) || (zoneId >= 0x20)) {
value = FALSE;
} else {
return this->zones[zoneId].getZoneBit().isOneSwitch(i_no - 0xE0);
if (i_no < 0xE0) {
value = this->zones[zoneId].getZoneBitConst().isSwitch(i_no - 0xC0);
} else {
value = this->zones[zoneId].getZoneBitConst().isOneSwitch(i_no - 0xE0);
}
}
}
return value;
}
#else
asm BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const {
@@ -1410,6 +1416,11 @@ asm BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const {
}
#endif
asm u8 dSv_info_c::revSwitch(int i_no, int i_roomNo) {
nofralloc
#include "d/d_save/d_save/asm/func_8003542c.s"
}
void dSv_info_c::onItem(int i_no, int i_roomNo) {
if ((i_no == -1) || (i_no == 0xFF)) {
return;
@@ -1432,7 +1443,7 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) {
BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const {
int value;
if ((i_no == -1) || (i_no == 0xFF)) {
return 0;
return FALSE;
}
if (i_no < 0x80) {