define collisions

This commit is contained in:
theo3
2023-12-31 21:24:07 -08:00
parent 48fdf9d827
commit dcc596ed87
125 changed files with 388 additions and 336 deletions
+3 -3
View File
@@ -78,7 +78,7 @@ void DirtParticle_Init(DirtParticleEntity* this) {
super->health = 1;
super->collisionFlags = 7;
super->hitType = 0xaa;
super->flags2 = 0x0e;
super->collisionMask = 0x0e;
super->hitbox = (Hitbox*)&gUnk_08120A8C;
super->gustJarFlags = 0;
case 2:
@@ -101,7 +101,7 @@ void DirtParticle_Init(DirtParticleEntity* this) {
void DirtParticle_Action1(DirtParticleEntity* this) {
DirtParticleEntity* entity;
if ((super->contactFlags & CONTACT_TAKE_DAMAGE) == 0) {
if ((super->contactFlags & CONTACT_NOW) == 0) {
return;
}
switch (super->contactFlags & 0x7f) {
@@ -128,7 +128,7 @@ void DirtParticle_Action3(DirtParticleEntity* this) {
sub_08087B9C,
sub_08087B9C,
};
if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) {
if ((super->contactFlags & CONTACT_NOW) != 0) {
gUnk_08120A80[super->subAction](this);
} else {
super->action = 1;