mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-31 09:22:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match sub_080177A0

Browse Source
This commit is contained in:
Tal Hayon
2022-01-13 17:00:40 +02:00
parent db40a8d833
commit d4bc136bd7
2 changed files with 6 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/collision.c
+6 -10
View File
@@ -177,22 +177,19 @@ NONMATCH("asm/non_matching/arm_proxy/sub_08017744.inc", void sub_08017744(Entity
}
END_NONMATCH
// regalloc
NONMATCH("asm/non_matching/arm_proxy/sub_080177A0.inc", bool32 sub_080177A0(Entity* this, Entity* that)) {
bool32 sub_080177A0(Entity* this, Entity* that) {
u32 this_d;
u32 depth;
if ((this->collisionLayer & that->collisionLayer) != 0) {
Hitbox* bb_this = this->hitbox;
Hitbox* bb_that = that->hitbox;
u32 this_w = bb_this->width;
u32 that_w = bb_that->width;
u32 sumw = this_w + that_w;
u32 this_len = bb_this->width;
u32 sumw = this_len + bb_that->width;
if ((((this->x.HALF.HI - that->x.HALF.HI) + bb_this->offset_x) - bb_that->offset_x) + sumw <= (sumw)*2) {
u32 this_h = bb_this->height;
u32 that_h = bb_that->height;
u32 sumh = this_h + that_h;
if ((((this->y.HALF.HI - that->y.HALF.HI) + bb_this->offset_y) - bb_that->offset_y) + sumh <= (sumh)*2) {
this_len = bb_this->height;
sumw = this_len + bb_that->height;
if ((((this->y.HALF.HI - that->y.HALF.HI) + bb_this->offset_y) - bb_that->offset_y) + sumw <= (sumw)*2) {
if ((this->field_0x3c & 0x10) != 0)
this_d = ((Hitbox3D*)bb_this)->depth;
else
@@ -208,7 +205,6 @@ NONMATCH("asm/non_matching/arm_proxy/sub_080177A0.inc", bool32 sub_080177A0(Enti
}
return FALSE;
}
END_NONMATCH
bool32 sub_08017850(Entity* this) {
if (sub_08079F8C())