falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove nonsense direction modifier macro

This commit is contained in:
Behemoth 2020-09-01 23:02:48 +02:00
parent 723d233967
commit 269d8970f3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/entity.h
View File

@ -173,8 +173,7 @@ extern void PositionRelative(Entity*, Entity*, s32, s32);
#define DirectionRoundUp(expr) DirectionRound((expr) + 4) #define DirectionRoundUp(expr) DirectionRound((expr) + 4)
#define DirectionIsHorizontal(expr) ((expr) & 0x08) #define DirectionIsHorizontal(expr) ((expr) & 0x08)
#define DirectionIsVertical(expr) ((expr) & 0x10) #define DirectionIsVertical(expr) ((expr) & 0x10)
#define DirectionTurnHorizontal(expr) (DirectionRoundUp(expr) ^ 0x08) #define DirectionTurnAround(expr) (DirectionRoundUp(expr) ^ 0x10)
#define DirectionTurnVertical(expr) (DirectionRoundUp(expr) ^ 0x10)
#define DirectionToAnimationState(expr) (DirectionRoundUp(expr) >> 3) #define DirectionToAnimationState(expr) (DirectionRoundUp(expr) >> 3)
#define DirectionFromAnimationState(expr) (expr << 3) #define DirectionFromAnimationState(expr) (expr << 3)

2
src/enemy/keaton.c
View File

@ -37,7 +37,7 @@ void sub_080323F4(Entity* this) {
if (this->action != 3 && this->action != 4) { if (this->action != 3 && this->action != 4) {
this->action = 3; this->action = 3;
this->actionDelay = 0xC; this->actionDelay = 0xC;
this->direction = DirectionTurnVertical(this->field_0x3e); this->direction = DirectionTurnAround(this->field_0x3e);
InitAnimationForceUpdate(this, this->direction >> 3); InitAnimationForceUpdate(this, this->direction >> 3);
} else if (this->bitfield == 0xCC) { } else if (this->bitfield == 0xCC) {
if (this->field_0x43 == 0) { if (this->field_0x43 == 0) {