From 269d8970f3f835824de34f7564f8df0c9a6d227f Mon Sep 17 00:00:00 2001 From: Behemoth Date: Tue, 1 Sep 2020 23:02:48 +0200 Subject: [PATCH] remove nonsense direction modifier macro --- include/entity.h | 3 +-- src/enemy/keaton.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/entity.h b/include/entity.h index c4537dce..dc269c33 100644 --- a/include/entity.h +++ b/include/entity.h @@ -173,8 +173,7 @@ extern void PositionRelative(Entity*, Entity*, s32, s32); #define DirectionRoundUp(expr) DirectionRound((expr) + 4) #define DirectionIsHorizontal(expr) ((expr) & 0x08) #define DirectionIsVertical(expr) ((expr) & 0x10) -#define DirectionTurnHorizontal(expr) (DirectionRoundUp(expr) ^ 0x08) -#define DirectionTurnVertical(expr) (DirectionRoundUp(expr) ^ 0x10) +#define DirectionTurnAround(expr) (DirectionRoundUp(expr) ^ 0x10) #define DirectionToAnimationState(expr) (DirectionRoundUp(expr) >> 3) #define DirectionFromAnimationState(expr) (expr << 3) diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c index b900cfea..4d7e003d 100644 --- a/src/enemy/keaton.c +++ b/src/enemy/keaton.c @@ -37,7 +37,7 @@ void sub_080323F4(Entity* this) { if (this->action != 3 && this->action != 4) { this->action = 3; this->actionDelay = 0xC; - this->direction = DirectionTurnVertical(this->field_0x3e); + this->direction = DirectionTurnAround(this->field_0x3e); InitAnimationForceUpdate(this, this->direction >> 3); } else if (this->bitfield == 0xCC) { if (this->field_0x43 == 0) {