label contact flags

zeldaret · Dec 31, 2023 · 5049daa · 5049daa
1 parent bd1be09
commit 5049daa
Show file tree

Hide file tree

Showing 96 changed files with 142 additions and 128 deletions.
diff --git a/include/collision.h b/include/collision.h
@@ -6,6 +6,16 @@
 
 /** Collisions. */
 
+enum {
+    COL_LANTERN = 0x7,
+    COL_SMALL_GUST = 0x13,
+    COL_BOOMERANG = 0x14,
+    COL_ARROW = 0x15,
+    COL_BIG_GUST = 0x1b,
+    COL_PACCI = 0x1d,
+    COL_SWORD_BEAM = 0x21,
+};
+
 typedef enum {
     COL_NONE = 0x0,
     COL_NORTH_WEST = 0x2,

diff --git a/include/entity.h b/include/entity.h
@@ -79,6 +79,8 @@ typedef enum {
     DirectionNorthWest = 0x1c, /**< North West. */
 } Direction;
 
+#define CONTACT_TAKE_DAMAGE 0x80
+
 typedef struct {
     void* entity1;
     void* entity2;

diff --git a/src/collision.c b/src/collision.c
@@ -371,7 +371,7 @@ CollisionResult CollisionNoOp(Entity* org, Entity* tgt, u32 direction, ColSettin
 // target: item
 CollisionResult CollisionGroundItem(Entity* org, Entity* tgt, u32 direction, ColSettings* settings) {
     COLLISION_OFF(tgt);
-    tgt->contactFlags = org->hurtType | 0x80;
+    tgt->contactFlags = org->hurtType | CONTACT_TAKE_DAMAGE;
     if ((tgt->type == 0x5F || tgt->type == 0x60) && sub_08081420(tgt))
         tgt->health = 0;
     return RESULT_COLLISION_WITHOUT_SET;
@@ -503,7 +503,7 @@ CollisionResult sub_08017DD4(Entity* org, Entity* tgt, u32 direction, ColSetting
         sub_08079D84();
         org->iframes = 90;
     } else {
-        gPlayerEntity.base.contactFlags = tgt->hurtType | 0x80;
+        gPlayerEntity.base.contactFlags = tgt->hurtType | CONTACT_TAKE_DAMAGE;
         gPlayerEntity.base.iframes = 12;
         gPlayerEntity.base.knockbackDuration = 16;
         gPlayerEntity.base.knockbackDirection = DirectionTurnAround(direction);

diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
@@ -96,7 +96,7 @@ void AcroBandit_OnTick(AcroBanditEntity* this) {
 void AcroBandit_OnCollision(AcroBanditEntity* this) {
     Entity* brother;
 
-    if (super->contactFlags != 0x80 && super->contactFlags != 0x81) {
+    if (super->contactFlags != CONTACT_TAKE_DAMAGE && super->contactFlags != (CONTACT_TAKE_DAMAGE | 0x1)) {
         if (super->type == 1) {
             if (super->action < 7 && super->knockbackDuration != 0) {
                 brother = super->child;

diff --git a/src/enemy/armos.c b/src/enemy/armos.c
@@ -337,7 +337,7 @@ bool32 sub_080305BC(ArmosEntity* this) {
 
 bool32 sub_08030650(ArmosEntity* this) {
     if (super->type == 0) {
-        if (super->contactFlags == 0x80) {
+        if (super->contactFlags == CONTACT_TAKE_DAMAGE) {
             return 1;
         }
     } else if (this->unk_80 != 2) {

diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
@@ -35,7 +35,7 @@ void Beetle_OnTick(BeetleEntity* this) {
 
 void Beetle_OnCollision(BeetleEntity* this) {
     switch (super->contactFlags) {
-        case 0x80:
+        case CONTACT_TAKE_DAMAGE:
             if (gPlayerState.framestate == PL_STATE_CLIMB) {
                 Beetle_OnTick(this);
             } else {
@@ -50,7 +50,7 @@ void Beetle_OnCollision(BeetleEntity* this) {
                 InitializeAnimation(super, 6);
             }
             break;
-        case 0x93:
+        case CONTACT_TAKE_DAMAGE | 0x13:
             Beetle_OnTick(this);
             break;
     }

diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c
@@ -38,7 +38,7 @@ void Bobomb_OnTick(BobombEntity* this) {
 }
 
 void Bobomb_OnCollision(BobombEntity* this) {
-    if (super->contactFlags & 0x80) {
+    if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
         switch (super->contactFlags & 0x7f) {
             case 0:
             case 1:

diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c
@@ -56,7 +56,7 @@ void BowMoblin_OnCollision(BowMoblinEntity* this) {
         EnemyCreateFX(super, FX_STARS);
     }
     EnemyFunctionHandlerAfterCollision(super, (EntityActionArray)BowMoblin_Functions);
-    if ((super->contactFlags & 0x80) != 0) {
+    if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
         sub_0803C5F0(this);
         pEVar1 = super->child;
         if (pEVar1 != NULL) {

diff --git a/src/enemy/chaser.c b/src/enemy/chaser.c
@@ -43,7 +43,7 @@ void sub_0802B540(Entity* this) {
 
 void sub_0802B56C(Entity* this) {
     GetNextFrame(this);
-    if (this->contactFlags & 0x80) {
+    if (this->contactFlags & CONTACT_TAKE_DAMAGE) {
         this->speed = 0x40;
     }
 

diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
@@ -1346,7 +1346,7 @@ void sub_080272D4(ChuchuBossEntity* this) {
             super->hitbox->height = (u32)((0x10000 / this->unk_74.HALF_U.HI) * 5) >> 6;
             if (*(char*)&this->unk_84 == 0)
                 break;
-            if ((super->contactFlags & 0x80) != 0) {
+            if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
                 if (super->iframes != 0) {
                     ((ChuchuBossEntity*)super->child)->unk_68->base.iframes = super->iframes;
                     super->child->parent->iframes = super->iframes;
@@ -1697,7 +1697,7 @@ bool32 sub_08027AA4(ChuchuBossEntity* this) {
     s32 iVar4;
     Helper* pHelper;
 
-    if ((super->contactFlags & 0x80) == 0) {
+    if ((super->contactFlags & CONTACT_TAKE_DAMAGE) == 0) {
         return FALSE;
     }
     switch (super->contactFlags & 0x7f) {

diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c
@@ -58,7 +58,7 @@ void CloudPiranha_OnCollision(CloudPiranhaEntity* this) {
         EnemyCreateFX(super, FX_STARS);
     }
     EnemyFunctionHandlerAfterCollision(super, gUnk_080CF4F0);
-    if ((super->contactFlags & 0x80) != 0) {
+    if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
         if (super->hitType == 0x5a) {
             switch (super->contactFlags & 0x3f) {
                 case 0x14:

diff --git a/src/enemy/crow.c b/src/enemy/crow.c
@@ -44,7 +44,7 @@ void Crow_OnTick(CrowEntity* this) {
 }
 
 void Crow_OnCollision(CrowEntity* this) {
-    if (super->contactFlags & 0x80) {
+    if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
         if ((super->contactFlags & 0x3f) == 0) {
             COLLISION_OFF(super);
             super->subtimer = 16;

diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
@@ -335,7 +335,8 @@ void sub_080210E4(DarkNutEntity* this) {
     }
 
     sub_08021644(this);
-    if ((super->frame & 0x10) && (!ProcessMovement0(super) || (super->child && (super->child->contactFlags & 0x80)))) {
+    if ((super->frame & 0x10) &&
+        (!ProcessMovement0(super) || (super->child && (super->child->contactFlags & CONTACT_TAKE_DAMAGE)))) {
         sub_080213D0(this, 0);
     } else {
         if (--this->unk_76 == 0)

diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c
@@ -79,15 +79,15 @@ void Enemy50_OnCollision(Enemy50Entity* this) {
         sub_08041134(this);
         sub_0803F6EC(this);
     }
-    if (super->hitType == 0x25 && super->contactFlags == 0x80) {
+    if (super->hitType == 0x25 && super->contactFlags == CONTACT_TAKE_DAMAGE) {
         super->action = 8;
         InitializeAnimation(super, 3);
     } else {
-        if (super->contactFlags == 0x80) {
+        if (super->contactFlags == CONTACT_TAKE_DAMAGE) {
             this->unk_7c = 0x78;
             sub_08041128(this);
         }
-        if (super->contactFlags == 0x9d) {
+        if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1d)) {
             super->zVelocity = Q_16_16(1.5);
         }
         if (super->confusedTime != 0) {
@@ -422,7 +422,7 @@ void sub_0804122C(Enemy50Entity* this) {
 
 #ifndef EU
 bool32 sub_08041300(Enemy50Entity* this) {
-    if ((super->hitType == 0x25) && (super->contactFlags == 0x80)) {
+    if ((super->hitType == 0x25) && (super->contactFlags == CONTACT_TAKE_DAMAGE)) {
         return TRUE;
     } else {
         return super->action == 8 || super->action == 9;

diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c
@@ -82,14 +82,14 @@ void Eyegore_OnTick(EyegoreEntity* this) {
 void Eyegore_OnCollision(EyegoreEntity* this) {
     u32 tmp;
 
-    if ((super->contactFlags == 0x95) || (super->contactFlags == 0x8e)) {
+    if ((super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x15)) || (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0xe))) {
         Entity* entity = super->contactedEntity;
         tmp = (((entity->direction + 4) & 0x18) ^ 0x10) >> 3;
         if (tmp == super->animationState) {
             if ((tmp & 1) != 0) {
                 if (0x10 < ((entity->y.HALF.HI + entity->z.HALF.HI) - (super->y.HALF.HI + super->z.HALF.HI)) + 0x14U) {
                 } else {
-                    if (super->contactFlags == 0x8e) {
+                    if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0xe)) {
                         super->health = 0;
                     } else {
                         super->health--;
@@ -105,7 +105,7 @@ void Eyegore_OnCollision(EyegoreEntity* this) {
                         EnqueueSFX(SFX_BUTTON_PRESS);
                         sub_08031344(this);
                     } else {
-                        if (super->contactFlags == 0x8e) {
+                        if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0xe)) {
                             super->health = 0;
                         } else {
                             super->health--;

diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c
@@ -93,7 +93,7 @@ void FlyingPot_OnTick(FlyingPotEntity* this) {
 void FlyingPot_OnCollision(FlyingPotEntity* this) {
     sub_08037418(this);
 
-    if (super->contactFlags == 0x9D) {
+    if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1d)) {
         super->action = FLYING_POT_ACTION_6;
         COLLISION_OFF(super);
         super->zVelocity = Q_16_16(2.625);

diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c
@@ -45,7 +45,7 @@ void FlyingSkull_OnTick(FlyingSkullEntity* this) {
 void FlyingSkull_OnCollision(FlyingSkullEntity* this) {
     sub_0803A100(this);
 
-    if (super->contactFlags == 0x9d) {
+    if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1d)) {
         super->action = 7;
         COLLISION_OFF(super);
         super->zVelocity = Q_16_16(2.625);

diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c
@@ -59,11 +59,11 @@ void Ghini_OnCollision(GhiniEntity* this) {
         sub_0803F630(this);
         sub_0803F6EC(this);
     }
-    if ((super->hitType == 0x25) && (super->contactFlags == 0x80)) {
+    if ((super->hitType == 0x25) && (super->contactFlags == CONTACT_TAKE_DAMAGE)) {
         super->action = 8;
         InitializeAnimation(super, 3);
     } else {
-        if (super->contactFlags == 0x9d) {
+        if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1d)) {
             super->zVelocity = 0x18000;
         }
         if (super->confusedTime != 0) {

diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
@@ -52,7 +52,7 @@ void Gibdo_OnTick(GibdoEntity* this) {
 }
 
 void Gibdo_OnCollision(GibdoEntity* this) {
-    if (super->contactFlags == 0x87) {
+    if (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x7)) {
         if (super->action == 0x6) {
             sub_08037ACC(this);
         }
@@ -62,7 +62,7 @@ void Gibdo_OnCollision(GibdoEntity* this) {
         Gibdo_CreateObjects(this);
     } else {
         if (super->action != 0x6) {
-            if (super->hitType == 0x27 && super->contactFlags == 0x80) {
+            if (super->hitType == 0x27 && super->contactFlags == CONTACT_TAKE_DAMAGE) {
                 sub_08037A14(this);
             } else {
                 if ((u8)(super->action - 1) < 2) {

diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c
@@ -659,7 +659,7 @@ void sub_0802D86C(GleerokEntity* this) {
                 }
             }
 
-            if ((super->contactFlags & 0x80) && this->unk_74 == 0) {
+            if ((super->contactFlags & CONTACT_TAKE_DAMAGE) && this->unk_74 == 0) {
                 if ((super->contactFlags & 0x7f) == 0x1d) {
                     super->zVelocity = Q_16_16(3.0);
                     super->parent->subAction = 4;
@@ -1039,7 +1039,7 @@ void sub_0802E0B8(GleerokEntity* this) {
         super->type2 = 4;
         InitializeAnimation(super, 0x4e);
     } else {
-        if (super->contactFlags & 0x80) {
+        if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
             if (super->iframes > 0) {
                 SoundReq(SFX_BOSS_HIT);
             }

diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c
@@ -20,7 +20,7 @@ void HangingSeed_OnTick(Entity* this) {
 }
 
 void HangingSeed_OnCollision(Entity* this) {
-    if (this->contactFlags & 0x80) {
+    if (this->contactFlags & CONTACT_TAKE_DAMAGE) {
         CreateFx(this, FX_BUSH, 0x80);
         DeleteThisEntity();
     }

diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c
@@ -143,7 +143,7 @@ void Keaton_Action3(KeatonEntity* this) {
 }
 
 void Keaton_Action4(KeatonEntity* this) {
-    if (super->child && (super->child->contactFlags & 0x80)) {
+    if (super->child && (super->child->contactFlags & CONTACT_TAKE_DAMAGE)) {
         sub_0803275C(this);
         return;
     }

diff --git a/src/enemy/leever.c b/src/enemy/leever.c
@@ -47,7 +47,7 @@ void Leever_OnTick(LeeverEntity* this) {
 }
 
 void Leever_OnCollision(LeeverEntity* this) {
-    if (super->contactFlags == 0x80) {
+    if (super->contactFlags == CONTACT_TAKE_DAMAGE) {
         if (super->action == 3) {
             this->unk_74 = 1;
         }

diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
@@ -46,8 +46,8 @@ void LikeLike_OnCollision(LikeLikeEntity* this) {
     } else {
         if (super->action == 7) {
             LikeLike_ReleasePlayer(this);
-        } else if (super->contactFlags & 0x80) {
-            u8 tmp = super->contactFlags & ~0x80;
+        } else if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
+            u8 tmp = super->contactFlags & ~CONTACT_TAKE_DAMAGE;
             if (tmp == 0) {
                 super->action = 7;
                 super->timer = 95;

diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
@@ -518,7 +518,7 @@ void sub_0802A098(MadderpillarEntity* this) {
 
 void sub_0802A0F8(MadderpillarEntity* this) {
     if (super->health != 0) {
-        if ((super->contactFlags & 0x80) && super->iframes != 0) {
+        if ((super->contactFlags & CONTACT_TAKE_DAMAGE) && super->iframes != 0) {
             Entity* entity = super;
             u32 i;
             for (i = 0; i < 6; i++) {
@@ -549,7 +549,7 @@ void sub_0802A16C(MadderpillarEntity* this) {
 }
 
 void sub_0802A18C(MadderpillarEntity* this) {
-    if (super->contactFlags & 0x80) {
+    if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
         switch (super->contactFlags & 0x7f) {
             case 0:
             case 1:

diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
@@ -167,7 +167,7 @@ void MazaalBracelet_OnCollision(MazaalBraceletEntity* this) {
 
     if (super->type < 2) {
         if (super->action != 0x2b) {
-            if ((0 < super->iframes) && ((super->contactFlags == 0x95 || (super->contactFlags == 0x8e)))) {
+            if ((0 < super->iframes) && ((super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x15) || (super->contactFlags == (CONTACT_TAKE_DAMAGE | 0xe))))) {
                 super->action = 0x28;
                 COLLISION_OFF(super);
                 entity = (MazaalBraceletEntity*)super->parent;
@@ -1299,7 +1299,7 @@ u32 sub_0803B870(MazaalBraceletEntity* this) {
     Entity* entity;
 
     entity = super->child;
-    if ((entity->contactFlags & 0x80) != 0 && (gPlayerState.flags & PL_CAPTURED)) {
+    if ((entity->contactFlags & CONTACT_TAKE_DAMAGE) != 0 && (gPlayerState.flags & PL_CAPTURED)) {
         super->action = 0x18;
         super->timer = 68;
         super->spriteSettings.draw = 0;

diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
@@ -101,7 +101,7 @@ void Moldworm_OnCollision(MoldwormEntity* this) {
         super->iframes = -8;
         this->unk_7f = 0;
         this->unk_7b = 0;
-        if (super->contactFlags == 0x80 || super->contactFlags == 0x9e) {
+        if (super->contactFlags == CONTACT_TAKE_DAMAGE || super->contactFlags == (CONTACT_TAKE_DAMAGE | 0x1e)) {
             super->type2 = 0;
             this->unk_80 = 0x14;
         } else {
@@ -441,15 +441,15 @@ void sub_08023894(MoldwormEntity* this) {
 }
 
 void sub_0802390C(MoldwormEntity* this) {
-    if (super->contactFlags & 0x80) {
+    if (super->contactFlags & CONTACT_TAKE_DAMAGE) {
         Entity* ent = super->child;
         do {
             ent->iframes = super->iframes;
         } while (ent = ent->child, ent != NULL);
     } else {
         Entity* ent = super->child;
         do {
-            if (ent->contactFlags & 0x80) {
+            if (ent->contactFlags & CONTACT_TAKE_DAMAGE) {
                 u8 bVar2 = 0xff - ent->health;
                 if (bVar2 != 0) {
                     u32 tmp;

diff --git a/src/enemy/mulldozer.c b/src/enemy/mulldozer.c
@@ -55,7 +55,7 @@ void Mulldozer_OnCollision(MulldozerEntity* this) {
         EnemyCreateFX(super, 0x1c);
     }
     EnemyFunctionHandlerAfterCollision(super, Mulldozer_Functions);
-    if ((super->contactFlags & 0x80) != 0) {
+    if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) {
         switch (super->contactFlags & 0x3f) {
             case 2:
             case 3: