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

Format

This commit is contained in:
Elliptic Ellipsis 2022-03-25 02:36:10 +00:00
parent fa1eb01528
commit b3a2644b4d
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/collision.h
View File

@ -5,8 +5,6 @@
#include "global.h" #include "global.h"
#include "entity.h" #include "entity.h"
/** Collisions. */ /** Collisions. */
typedef enum { typedef enum {
COL_NONE = 0x0, COL_NONE = 0x0,

3
src/enemy/octorokBoss.c
View File

@ -644,7 +644,8 @@ void OctorokBoss_Action1_ChargeAttack(OctorokBossEntity* this) {
if ((super->direction != 0) && (super->direction != 0x10)) { if ((super->direction != 0) && (super->direction != 0x10)) {
knockbackCondition = ((super->collisions & (COL_EAST_ANY | COL_WEST_ANY)) != COL_NONE); knockbackCondition = ((super->collisions & (COL_EAST_ANY | COL_WEST_ANY)) != COL_NONE);
} }
if (((super->direction != 0x18) && (super->direction != 8)) && (super->collisions & (COL_NORTH_ANY | COL_SOUTH_ANY))) { if (((super->direction != 0x18) && (super->direction != 8)) &&
(super->collisions & (COL_NORTH_ANY | COL_SOUTH_ANY))) {
knockbackCondition = TRUE; knockbackCondition = TRUE;
} }
if (knockbackCondition) { if (knockbackCondition) {

2
src/movement.c
View File

@ -1589,7 +1589,7 @@ bool32 IsTileCollision(const u8* layer, s32 x, s32 y, u32 collisionType) {
FilledAll, FilledAll,
FilledAll, FilledAll,
/**/ /**/
FilledNone FilledNone,
}; };
if (tileType > 0x6f) { if (tileType > 0x6f) {
return TRUE; return TRUE;