falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #660 from KEKW555/Remove-fakematch-sub_0801A570 

True match 0801A570
This commit is contained in:
Theo 2023-12-23 21:12:07 -08:00 committed by GitHub
parent 06591e7c31 a3097b5d85
commit 32788830ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/beanstalkSubtask.c
View File

@ -740,7 +740,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) {
LayerStruct* layer;
u32 tileType;
u32 position;
s32 index1;
u32 index1;
u32 index2;
u16* metatileTypes;
u8* collisionData;
@ -776,17 +776,15 @@ u32 sub_0801A570(Entity* this, u32 param_2) {
}
index1 = GetTileType(position, this->collisionLayer);
if ((u32)(index1 - 0x369) <= 1) {
collisionData = layer->collisionData - 0x40 + position;
index1 = 0;
if (index1 < index2) {
while (collisionData[index1] == 0) {
if (++index1 >= index2)
goto end;
}
if ((index1 - 0x369) > 1) {
position = 0xffff;
} else {
goto end;
collisionData = layer->collisionData - 0x40 + position;
for (index1 = 0; index1 < index2; index1++) {
if (collisionData[index1] != 0) {
position = 0xffff;
break;
}
}
}
break;
@ -810,21 +808,17 @@ u32 sub_0801A570(Entity* this, u32 param_2) {
if (param_2 == 0) {
return position;
}
index1 = GetTileType(position, this->collisionLayer);
if ((index1 == 0x369) || (index1 == 0x36d)) {
if (!(index1 == 0x369) && !(index1 == 0x36d))
position = 0xffff;
else {
collisionData = layer->collisionData + (position + index2);
index1 = 0;
if (index1 < index2) {
u8* flagPtr = collisionData + index1;
while (*flagPtr == 0) {
if (++index1 >= index2)
goto end;
flagPtr = (u8*)((index1 << 6) + (u32)collisionData);
for (index1 = 0; index1 < index2; index1++) {
if (collisionData[index1 * 0x40] != 0) {
position = 0xffff;
break;
}
} else {
goto end;
}
}
break;
@ -850,16 +844,15 @@ u32 sub_0801A570(Entity* this, u32 param_2) {
}
index1 = GetTileType(position, this->collisionLayer);
if ((index1 == 0x369) || (index1 == 0x36b)) {
if (!(index1 == 0x369) && !(index1 == 0x36b))
position = 0xffff;
else {
collisionData = layer->collisionData + (position + (index2 * 0x40));
index1 = 0;
if (index1 < index2) {
while (collisionData[index1] == 0) {
if (++index1 >= index2)
goto end;
for (index1 = 0; index1 < index2; index1++) {
if (collisionData[index1] != 0) {
position = 0xffff;
break;
}
} else {
goto end;
}
}
break;
@ -885,31 +878,18 @@ u32 sub_0801A570(Entity* this, u32 param_2) {
}
index1 = GetTileType(position, this->collisionLayer);
if ((index1 == 0x369) || (index1 == 0x36c)) {
collisionData = layer->collisionData - 1 + position;
// This loop is functionally equivalent to the one present in case 1
index1 = 0;
if (index1 < index2) {
u32 flag;
flag = collisionData[index1];
goto case3_flag_check;
case3_loop_back:
if (++index1 >= index2)
goto end;
flag = *(u8*)((index1 << 6) + (u32)collisionData);
case3_flag_check:
if (flag != 0)
break;
goto case3_loop_back;
} else {
goto end;
}
}
break;
}
if (!(index1 == 0x369) && !(index1 == 0x36c))
position = 0xffff;
end:
else {
collisionData = layer->collisionData - 1 + position;
for (index1 = 0; index1 < index2; index1++) {
if (collisionData[index1 * 0x40] != 0) {
position = 0xffff;
break;
}
}
}
}
if (param_2 != 0) {
position |= index2 << 0xc;
}