diff options
Diffstat (limited to 'src/object/minecart.c')
| -rw-r--r-- | src/object/minecart.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/minecart.c b/src/object/minecart.c index b13f2c7e..30594d6d 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -54,7 +54,7 @@ void Minecart_Init(MinecartEntity* this) { super->hitType = 1; super->collisionFlags = 0x47; super->hurtType = 0x44; - super->flags2 = 0x80; + super->collisionMask = 0x80; super->direction = DirectionFromAnimationState(super->animationState); super->speed = 0x700; super->spritePriority.b1 = 3; @@ -112,7 +112,7 @@ void Minecart_Action2(MinecartEntity* this) { super->flags |= ENT_PERSIST; super->hitType = 0x97; super->collisionFlags = (gPlayerEntity.base.collisionFlags + 1) | 0x20; - super->flags2 = gPlayerEntity.base.flags2; + super->collisionMask = gPlayerEntity.base.collisionMask; super->hurtType = 0x18; super->damage = 8; sub_0801766C(super); @@ -176,7 +176,7 @@ void Minecart_Action3(MinecartEntity* this) { super->hitType = 1; super->collisionFlags = 0x47; super->hurtType = 0x44; - super->flags2 = 0x80; + super->collisionMask = 0x80; super->action = 6; sub_08017744(super); gPlayerState.jump_status = 0x41; |
