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

Use COL_ enum

This commit is contained in:
Elliptic Ellipsis 2022-03-25 01:25:02 +00:00
parent 1580dd1f2c
commit fa1eb01528
30 changed files with 185 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/enemy/bobomb.c
View File

@ -6,6 +6,7 @@
*/
#include "asm.h"
#include "collision.h"
#include "sound.h"
#include "enemy.h"
#include "object.h"
@ -160,7 +161,7 @@ void sub_0802C91C(Entity* this) {
GetNextFrame(this);
ProcessMovement0(this);
if (this->field_0x82.HALF.LO) {
if (this->collisions) {
if (this->collisions != COL_NONE) {
sub_0800417E(this, this->collisions);
InitializeAnimation(this, (this->direction >> 4) | 2);
}
@ -173,7 +174,7 @@ void sub_0802C91C(Entity* this) {
sub_0802CC18(this);
}
} else {
if (this->collisions) {
if (this->collisions != COL_NONE) {
sub_0800417E(this, this->collisions);
InitializeAnimation(this, this->direction >> 4);
}

3
src/enemy/cloudPiranha.c
View File

@ -7,6 +7,7 @@
#define NENT_DEPRECATED
#include "global.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "coord.h"
@ -259,7 +260,7 @@ void sub_080387F0(CloudPiranhaEntity* this) {
if ((iVar4 == 0xf) || (iVar4 == 0x2a)) {
super->direction = (super->direction + 0x10) & 0x1f;
} else {
if (super->collisions != 0) {
if (super->collisions != COL_NONE) {
sub_0800417E(super, super->collisions);
}
}

7
src/enemy/flyingSkull.c
View File

@ -1,4 +1,5 @@
#define NENT_DEPRECATED
#include "collision.h"
#include "entity.h"
#include "enemy.h"
#include "functions.h"
@ -159,7 +160,7 @@ void sub_08039ECC(FlyingSkullEntity* this) {
void sub_08039EE4(FlyingSkullEntity* this) {
super->subAction = 1;
COLLISION_OFF(super);
super->collisions = 0;
super->collisions = COL_NONE;
super->hitbox = (Hitbox*)&gUnk_080FD340;
gPlayerEntity.animationState;
this->unk_0x76 = gPlayerEntity.animationState;
@ -175,7 +176,7 @@ void sub_08039F4C(FlyingSkullEntity* this) {
void sub_08039F78(FlyingSkullEntity* this) {
super->spritePriority.b1 = 1;
if (super->z.HALF.HI == 0 || super->collisions) {
if (super->z.HALF.HI == 0 || (super->collisions != COL_NONE)) {
sub_0803A0E0(this);
}
}
@ -222,7 +223,7 @@ void sub_0803A09C(FlyingSkullEntity* this) {
GetNextFrame(super);
ProcessMovement2(super);
if (super->collisions) {
if (super->collisions != COL_NONE) {
sub_0803A0E0(this);
}
}

3
src/enemy/moldorm.c
View File

@ -6,6 +6,7 @@
*/
#include "enemy.h"
#include "collision.h"
#include "functions.h"
void sub_08022EAC(Entity*);
@ -103,7 +104,7 @@ void sub_08022D40(Entity* this) {
sub_08022F14(this);
ProcessMovement0(this);
if (this->collisions) {
if (this->collisions != COL_NONE) {
sub_0800417E(this, this->collisions);
this->animationState = ((this->direction + 2) & 0x1c) >> 2;
this->frameIndex = this->animationState;

9
src/enemy/mulldozer.c
View File

@ -7,6 +7,7 @@
#define NENT_DEPRECATED
#include "global.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -63,11 +64,11 @@ void sub_08032CAC(MulldozerEntity* this) {
case 2:
case 3:
super->action = 6;
super->actionDelay = super->type != 0 ? 0x5a : 200;
super->actionDelay = (super->type != 0) ? 0x5a : 200;
super->field_0xf = 2;
this->unk_80 = 3;
super->direction = super->knockbackDirection;
super->direction = (super->direction + ((Random() & 0x40) != 0 ? 4 : 0x1c));
super->direction += ((Random() & 0x40) != 0) ? 4 : 0x1c;
super->direction &= 0x1f;
super->speed = 0;
break;
@ -102,7 +103,7 @@ void Mulldozer_Action1(MulldozerEntity* this) {
if (--super->actionDelay == 0) {
sub_080330C0(this);
} else {
if (sub_08033364(this) != 0) {
if (sub_08033364(this)) {
sub_08033100(this);
}
}
@ -200,7 +201,7 @@ void sub_08032F48(MulldozerEntity* this) {
}
void sub_08032F64(MulldozerEntity* this) {
if (super->collisions != 0) {
if (super->collisions != COL_NONE) {
sub_0800417E(super, super->collisions);
super->animationState = super->direction >> 2;
sub_08032F24(this);

25
src/enemy/octorokBoss.c
View File

@ -6,6 +6,7 @@
*/
#define NENT_DEPRECATED
#include "enemy/octorokBoss.h"
#include "collision.h"
#include "functions.h"
#include "game.h"
#include "object.h"
@ -639,14 +640,14 @@ void OctorokBoss_Action1_ChargeAttack(OctorokBossEntity* this) {
if (this->timer == 0) {
ProcessMovement0(super);
knockbackCondition = 0;
knockbackCondition = FALSE;
if ((super->direction != 0) && (super->direction != 0x10)) {
knockbackCondition = ((u32)super->collisions & 0xee00) != 0;
knockbackCondition = ((super->collisions & (COL_EAST_ANY | COL_WEST_ANY)) != COL_NONE);
}
if (((super->direction != 0x18) && (super->direction != 8)) && ((super->collisions & 0xee) != 0)) {
knockbackCondition = 1;
if (((super->direction != 0x18) && (super->direction != 8)) && (super->collisions & (COL_NORTH_ANY | COL_SOUTH_ANY))) {
knockbackCondition = TRUE;
}
if (knockbackCondition != 0) {
if (knockbackCondition) {
super->knockbackDuration = 0x20;
super->knockbackSpeed = 0x200;
super->knockbackDirection = super->direction ^ 0x10;
@ -911,7 +912,7 @@ void OctorokBoss_Burning(OctorokBossEntity* this) {
void OctorokBoss_Burning_SubAction0(OctorokBossEntity* this) {
super->subAction = 1;
super->speed = 0x200;
super->collisions = 0;
super->collisions = COL_NONE;
super->direction = (u8)(-this->angle.HALF.HI ^ 0x80U) >> 3;
this->timer = 0x78;
this->angularSpeed.HWORD = 0x180;
@ -922,13 +923,13 @@ void OctorokBoss_Burning_SubAction0(OctorokBossEntity* this) {
void OctorokBoss_Burning_SubAction1(OctorokBossEntity* this) {
ProcessMovement0(super);
if (super->collisions != 0) {
if (super->collisions != COL_NONE) {
super->subAction = 2;
this->heap->targetAngle = this->angle.HALF.HI;
if ((super->collisions & 0xee00) != 0) {
if ((super->collisions & (COL_EAST_ANY | COL_WEST_ANY)) != COL_NONE) {
this->heap->targetAngle = -this->heap->targetAngle;
}
if ((super->collisions & 0xee) != 0) {
if ((super->collisions & (COL_NORTH_ANY | COL_SOUTH_ANY)) != COL_NONE) {
this->heap->targetAngle = -this->heap->targetAngle ^ 0x80;
}
super->knockbackDuration = 0x18;
@ -951,10 +952,10 @@ void OctorokBoss_Burning_SubAction2(OctorokBossEntity* this) {
if ((u32)(this->heap->targetAngle - this->angle.HALF.HI + 7) < 0xf) {
super->subAction = 1;
super->direction = ((u8) - this->angle.HALF.HI ^ 0x80) >> 3;
super->collisions = 0;
super->collisions = COL_NONE;
ProcessMovement0(super);
} else {
if ((u8)(this->heap->targetAngle - this->angle.HALF.HI) >= 0x81) {
if ((u8)(this->heap->targetAngle - this->angle.HALF.HI) > 0x80) {
this->angle.HWORD -= this->angularSpeed.HWORD;
} else {
this->angle.HWORD += this->angularSpeed.HWORD;
@ -1161,7 +1162,7 @@ void OctorokBoss_StartRegularAttack(OctorokBossEntity* this) {
super->subAction = ACTION1_SUBACTION2;
super->speed = 0x200;
this->timer = 0x3c;
super->collisions = 0;
super->collisions = COL_NONE;
this->heap->unk_0 = 4;
SoundReq(SFX_159);
return;

3
src/enemy/pesto.c
View File

@ -6,6 +6,7 @@
*/
#include "enemy.h"
#include "collision.h"
#include "object.h"
#include "game.h"
#include "functions.h"
@ -525,7 +526,7 @@ void sub_080244E8(Entity* this) {
void sub_08024940(Entity* this) {
u32 random = Random() & 0x70;
if (this->collisions != 0) {
if (this->collisions != COL_NONE) {
sub_0800417E(this, this->collisions);
sub_080249F4(this);
}

3
src/enemy/puffstool.c
View File

@ -6,6 +6,7 @@
*/
#include "enemy.h"
#include "collision.h"
#include "object.h"
#include "functions.h"
@ -156,7 +157,7 @@ void sub_08025230(Entity* this) {
this->direction = sub_08025C60(this);
}
if (this->collisions != 0) {
if (this->collisions != COL_NONE) {
if (--this->field_0xf == 0) {
sub_0800417E(this, this->collisions);
}

3
src/enemy/scissorsBeetle.c
View File

@ -1,4 +1,5 @@
#define NENT_DEPRECATED
#include "collision.h"
#include "entity.h"
#include "enemy.h"
#include "functions.h"
@ -92,7 +93,7 @@ void sub_080389E8(ScissorsBeetleEntity* this) {
sub_08038C2C((ScissorsBeetleEntity*)child);
} else if (super->actionDelay) {
super->actionDelay--;
} else if (super->collisions) {
} else if (super->collisions != COL_NONE) {
super->actionDelay = 0xc;
if ((child->animationState & 1) == 0) {
child->animationState += Random() & 0x20 ? 1 : 7;

28
src/enemy/spark.c
View File

@ -5,6 +5,7 @@
* @brief Spark enemy
*/
#include "collision.h"
#include "enemy.h"
#include "object.h"
#include "functions.h"
@ -40,7 +41,6 @@ void Spark_OnCollision(Entity* this) {
}
void Spark_OnGrabbed(Entity* this) {
/* ... */
}
void sub_0802B33C(Entity* this) {
@ -57,7 +57,7 @@ void sub_0802B35C(Entity* this) {
GetNextFrame(this);
ProcessMovement0(this);
is_head = this->type == 0;
if (this->collisions == 0) {
if (this->collisions == COL_NONE) {
if (--this->field_0xf == 0) {
this->field_0xf = 0x78;
@ -68,49 +68,49 @@ void sub_0802B35C(Entity* this) {
this->field_0xf = 0x78;
switch (DirectionRound(this->direction)) {
case DirectionNorth:
if (this->collisions & 0xe) {
if ((this->collisions & COL_NORTH_ANY) != COL_NONE) {
this->direction = is_head ? DirectionWest : DirectionEast;
} else {
if ((this->collisions & 0xe000) == 0x4000 && is_head) {
if (((this->collisions & COL_EAST_ANY) == COL_EAST_NORTH) && is_head) {
this->direction = DirectionEast;
}
if ((this->collisions & 0xe00) == 0x400 && !is_head) {
if (((this->collisions & COL_WEST_ANY) == COL_WEST_NORTH) && !is_head) {
this->direction = DirectionWest;
}
}
break;
case DirectionSouth:
if (this->collisions & 0xe0) {
if ((this->collisions & COL_SOUTH_ANY) != COL_NONE) {
this->direction = is_head ? DirectionEast : DirectionWest;
} else {
if ((this->collisions & 0xe000) == 0x2000 && !is_head) {
if (((this->collisions & COL_EAST_ANY) == COL_EAST_SOUTH) && !is_head) {
this->direction = DirectionEast;
}
if ((this->collisions & 0xe00) == 0x200 && is_head) {
if (((this->collisions & COL_WEST_ANY) == COL_WEST_SOUTH) && is_head) {
this->direction = DirectionWest;
}
}
break;
case DirectionWest:
if (this->collisions & 0xe00) {
if ((this->collisions & COL_WEST_ANY) != COL_NONE) {
this->direction = is_head ? DirectionSouth : DirectionNorth;
} else {
if ((this->collisions & 0xe) == 4 && is_head) {
if (((this->collisions & COL_NORTH_ANY) == COL_NORTH_EAST) && is_head) {
this->direction = DirectionNorth;
}
if ((this->collisions & 0xe0) == 0x40 && !is_head) {
if (((this->collisions & COL_SOUTH_ANY) == COL_SOUTH_EAST) && !is_head) {
this->direction = DirectionSouth;
}
}
break;
case DirectionEast:
if (this->collisions & 0xe000) {
if ((this->collisions & COL_EAST_ANY) != COL_NONE) {
this->direction = is_head ? DirectionNorth : DirectionSouth;
} else {
if ((this->collisions & 0xe) == 2 && !is_head) {
if (((this->collisions & COL_NORTH_ANY) == COL_NORTH_WEST) && !is_head) {
this->direction = DirectionNorth;
}
if ((this->collisions & 0xe0) == 0x20 && is_head) {
if (((this->collisions & COL_SOUTH_ANY) == COL_SOUTH_WEST) && is_head) {
this->direction = DirectionSouth;
}
}

3
src/enemy/stalfos.c
View File

@ -7,6 +7,7 @@
#define NENT_DEPRECATED
#include "global.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -366,7 +367,7 @@ void sub_0803992C(StalfosEntity* this) {
super->direction = super->animationState << 3;
this->unk_78 = (u16)gUnk_080CF900[Random() & 0xf];
CalculateEntityTileCollisions(super, super->direction, 0);
if ((gUnk_080CF910[super->animationState] & super->collisions) != 0) {
if ((gUnk_080CF910[super->animationState] & super->collisions) != COL_NONE) {
InitAnimationForceUpdate(super, super->animationState);
} else {
InitAnimationForceUpdate(super, super->animationState + 4);

3
src/enemy/tektite.c
View File

@ -5,6 +5,7 @@
* @brief Tektite enemy
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -135,7 +136,7 @@ void sub_0802F300(Entity* this) {
this->field_0xf = 0;
InitializeAnimation(this, 3);
return;
} else if (this->collisions != 0) {
} else if (this->collisions != COL_NONE) {
sub_0800417E(this, this->collisions);
} else if ((GetTileUnderEntity(this) & 0xf0) == 0x50) {
this->direction = (this->direction + 0x10) & 0x1f;

3
src/enemy/tektiteGolden.c
View File

@ -5,6 +5,7 @@
* @brief Golden Tektite enemy
*/
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -114,7 +115,7 @@ void sub_08038048(Entity* this) {
this->actionDelay = 0x14;
InitializeAnimation(this, 3);
return;
} else if (this->collisions != 0) {
} else if (this->collisions != COL_NONE) {
sub_0800417E(this, this->collisions);
} else if ((GetTileUnderEntity(this) & 0xf0) == 0x50) {
this->direction = (this->direction + 0x10) & 0x1f;

3
src/enemy/wisp.c
View File

@ -5,6 +5,7 @@
* @brief Wisp enemy
*/
#include "collision.h"
#include "enemy.h"
#include "save.h"
#include "object.h"
@ -102,7 +103,7 @@ void sub_08033674(Entity* this) {
void sub_080336A8(Entity* this) {
if (--this->actionDelay == 0) {
sub_08033744(this);
} else if (this->collisions != 0) {
} else if (this->collisions != COL_NONE) {
sub_0800417E(this, this->collisions);
}
ProcessMovement0(this);

3
src/enemy/wizzrobeWind.c
View File

@ -7,6 +7,7 @@
#define NENT_DEPRECATED
#include "global.h"
#include "collision.h"
#include "enemy.h"
#include "enemy/wizzrobe.h"
#include "functions.h"
@ -262,7 +263,7 @@ void sub_0802F9C8(WizzrobeEntity* this) {
} else {
if (super->type2 != 0) {
ProcessMovement0(super);
if (super->collisions != 0) {
if (super->collisions != COL_NONE) {
super->flags &= 0x7f;
this->timer1 = 0x28;
}

137
src/movement.c
View File

@ -89,7 +89,8 @@ bool32 TileCollisionFunction2(s32 x, s32 y) {
0b1111111111111110,
0b1111111111111111,
*/
32768, 49152, 57344, 61440, 63488, 64512, 65024, 65280, 65408, 65472, 65504, 65520, 65528, 65532, 65534, 65535,
0x8000, 0xC000, 0xE000, 0xF000, 0xF800, 0xFC00, 0xFE00, 0xFF00,
0xFF80, 0xFFC0, 0xFFE0, 0xFFF0, 0xFFF8, 0xFFFC, 0xFFFE, 0xFFFF,
};
return gUnk_08133918[y & 0xf] >> (x & 0xf) & 1;
@ -99,24 +100,24 @@ bool32 TileCollisionFunction2(s32 x, s32 y) {
bool32 TileCollisionFunction3(s32 x, s32 y) {
static const u16 gUnk_08133938[] = {
/*
0b1,
0b11,
0b111,
0b1111,
0b11111,
0b111111,
0b1111111,
0b11111111,
0b111111111,
0b1111111111,
0b11111111111,
0b111111111111,
0b1111111111111,
0b11111111111111,
0b111111111111111,
0b0000000000000001,
0b0000000000000011,
0b0000000000000111,
0b0000000000001111,
0b0000000000011111,
0b0000000000111111,
0b0000000001111111,
0b0000000011111111,
0b0000000111111111,
0b0000001111111111,
0b0000011111111111,
0b0000111111111111,
0b0001111111111111,
0b0011111111111111,
0b0111111111111111,
0b1111111111111111,
*/
1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535,
0x1, 0x3, 0x7, 0xF, 0x1F, 0x3F, 0x7F, 0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF,
};
return gUnk_08133938[y & 0xf] >> (x & 0xf) & 1;
}
@ -142,7 +143,8 @@ bool32 TileCollisionFunction4(s32 x, s32 y) {
0b1100000000000000,
0b1000000000000000,
*/
65535, 65534, 65532, 65528, 65520, 65504, 65472, 65408, 65280, 65024, 64512, 63488, 61440, 57344, 49152, 32768,
0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0xFF80,
0xFF00, 0xFE00, 0xFC00, 0xF800, 0xF000, 0xE000, 0xC000, 0x8000,
};
return gUnk_08133958[y & 0xf] >> (x & 0xf) & 1;
}
@ -152,23 +154,23 @@ bool32 TileCollisionFunction5(s32 x, s32 y) {
static const u16 gUnk_08133978[] = {
/*
0b1111111111111111,
0b111111111111111,
0b11111111111111,
0b1111111111111,
0b111111111111,
0b11111111111,
0b1111111111,
0b111111111,
0b11111111,
0b1111111,
0b111111,
0b11111,
0b1111,
0b111,
0b11,
0b1,
0b0111111111111111,
0b0011111111111111,
0b0001111111111111,
0b0000111111111111,
0b0000011111111111,
0b0000001111111111,
0b0000000111111111,
0b0000000011111111,
0b0000000001111111,
0b0000000000111111,
0b0000000000011111,
0b0000000000001111,
0b0000000000000111,
0b0000000000000011,
0b0000000000000001,
*/
65535, 32767, 16383, 8191, 4095, 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1,
0xFFFF, 0x7FFF, 0x3FFF, 0x1FFF, 0xFFF, 0x7FF, 0x3FF, 0x1FF, 0xFF, 0x7F, 0x3F, 0x1F, 0xF, 0x7, 0x3, 0x1,
};
return gUnk_08133978[y & 0xf] >> (x & 0xf) & 1;
}
@ -187,14 +189,14 @@ bool32 TileCollisionFunction6(s32 x, s32 y) {
0b1111111111111111,
0b1111111111111111,
0b1111111111111111,
0b0,
0b0,
0b0,
0b0,
0b0,
0b0,
0b0000000000000000,
0b0000000000000000,
0b0000000000000000,
0b0000000000000000,
0b0000000000000000,
0b0000000000000000,
*/
65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 0, 0, 0, 0, 0, 0,
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
};
return gUnk_08133998[y & 0xf] >> (x & 0xf) & 1;
@ -204,12 +206,12 @@ bool32 TileCollisionFunction6(s32 x, s32 y) {
bool32 TileCollisionFunction7(s32 x, s32 y) {
static const u16 gUnk_081339B8[] = {
/*
0b0,
0b0,
0b0,
0b0,
0b0,
0b0,
0b0000000000000000,
0b0000000000000000,
0b0000000000000000,
0b0000000000000000,
0b0000000000000000,
0b0000000000000000,
0b1111111111111111,
0b1111111111111111,
0b1111111111111111,
@ -221,7 +223,7 @@ bool32 TileCollisionFunction7(s32 x, s32 y) {
0b1111111111111111,
0b1111111111111111,
*/
0, 0, 0, 0, 0, 0, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
};
return gUnk_081339B8[y & 0xf] >> (x & 0xf) & 1;
}
@ -247,7 +249,8 @@ bool32 TileCollisionFunction8(s32 x, s32 y) {
0b1111111111000000,
0b1111111111000000,
*/
65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472, 65472,
0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0,
0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0, 0xFFC0,
};
return gUnk_081339D8[y & 0xf] >> (x & 0xf) & 1;
}
@ -256,24 +259,24 @@ bool32 TileCollisionFunction8(s32 x, s32 y) {
bool32 TileCollisionFunction9(s32 x, s32 y) {
static const u16 gUnk_081339F8[] = {
/*
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b1111111111,
0b[000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
0b0000001111111111,
*/
1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF, 0x3FF,
};
return gUnk_081339F8[y & 0xf] >> (x & 0xf) & 1;
}
@ -1586,7 +1589,7 @@ bool32 IsTileCollision(const u8* layer, s32 x, s32 y, u32 collisionType) {
FilledAll,
FilledAll,
/**/
FilledNone,
FilledNone
};
if (tileType > 0x6f) {
return TRUE;

9
src/npc/dog.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "functions.h"
#include "npc.h"
#include "item.h"
@ -143,17 +144,17 @@ void sub_08069D54(Entity* this) {
if (this->x.HALF.HI < this->field_0x6e.HWORD) {
this->x.HALF.HI = this->field_0x6e.HWORD + 1;
collisions = 0xe00;
collisions = COL_WEST_ANY;
} else if (this->x.HALF.HI > this->field_0x6c.HWORD) {
this->x.HALF.HI = this->field_0x6c.HWORD - 1;
collisions = 0xe000;
collisions = COL_EAST_ANY;
}
if (this->y.HALF.HI < this->field_0x70.HALF_U.LO) {
this->y.HALF.HI = this->field_0x70.HALF_U.LO + 1;
collisions = 0xe;
collisions = COL_NORTH_ANY;
} else if (this->y.HALF.HI > this->field_0x70.HALF_U.HI) {
this->y.HALF.HI = this->field_0x70.HALF_U.HI - 1;
collisions = 0xe0;
collisions = COL_SOUTH_ANY;
}
sub_0800417E(this, collisions);
sub_08069F6C(this);

11
src/object/playerClone.c
View File

@ -1,5 +1,6 @@
#define NENT_DEPRECATED
#include "entity.h"
#include "collision.h"
#include "room.h"
#include "asm.h"
#include "sound.h"
@ -49,7 +50,12 @@ void PlayerClone_Init(PlayerCloneEntity* this) {
SoundReq(SFX_112);
}
const u16 PlayerCloneCollisions[] = { 0x2206, 0x6044, 0x4460, 0x622 };
const u16 PlayerCloneCollisions[] = {
COL_NORTH_FULL | COL_WEST_SOUTH | COL_EAST_SOUTH,
COL_NORTH_EAST | COL_SOUTH_EAST | COL_EAST_FULL,
COL_SOUTH_FULL | COL_WEST_NORTH | COL_EAST_NORTH,
COL_NORTH_WEST | COL_SOUTH_WEST | COL_WEST_FULL,
};
void PlayerClone_Action1(PlayerCloneEntity* this) {
static const Hitbox PlayerCloneHitbox = { 0, -3, { 5, 3, 3, 5 }, 6, 6 };
@ -104,7 +110,8 @@ void PlayerClone_Action2(PlayerCloneEntity* this) {
super->y.HALF.HI = gPlayerEntity.y.HALF.HI + this->unk7a;
sub_08084CAC(this);
sub_080085B0(super);
if ((super->collisions & 0x6666) != 0x6666) {
if ((super->collisions & (COL_NORTH_FULL | COL_SOUTH_FULL | COL_EAST_FULL | COL_WEST_FULL)) !=
(COL_NORTH_FULL | COL_SOUTH_FULL | COL_EAST_FULL | COL_WEST_FULL)) {
for (index = 0; index <= 3; index++) {
if (PlayerCloneCollisions[index] == (PlayerCloneCollisions[index] & super->collisions)) {
break;

15
src/object/smallIceBlock.c
View File

@ -7,6 +7,7 @@
#define NENT_DEPRECATED
#include "global.h"
#include "collision.h"
#include "object.h"
#include "functions.h"
#include "hitbox.h"
@ -204,7 +205,7 @@ bool32 sub_0809953C(SmallIceBlockEntity* this) {
uVar3 = sub_0800442E(super);
if (uVar3 != 0) {
return 0;
return FALSE;
}
ProcessMovement2(super);
sub_0800445C(super);
@ -216,17 +217,17 @@ bool32 sub_0809953C(SmallIceBlockEntity* this) {
}
switch (super->direction >> 3) {
case 0:
if ((super->collisions & 0xe) == 0) {
return 0;
if ((super->collisions & COL_NORTH_ANY) == COL_NONE) {
return FALSE;
}
if ((u32)(super->y.HALF.HI & 0xf) - 7 < 3) {
super->y.HALF.HI = (super->y.HALF.HI & 0xfff0) + 8;
return 1;
return TRUE;
}
sub_0809969C(this);
break;
case 1:
if ((super->collisions & 0xe000) == 0) {
if ((super->collisions & COL_EAST_ANY) == COL_NONE) {
return FALSE;
}
if ((u32)(super->x.HALF.HI & 0xf) - 7 < 3) {
@ -236,7 +237,7 @@ bool32 sub_0809953C(SmallIceBlockEntity* this) {
sub_0809969C(this);
break;
case 2:
if ((super->collisions & 0xe0) == 0) {
if ((super->collisions & COL_SOUTH_ANY) == COL_NONE) {
return FALSE;
}
if ((u32)(super->y.HALF.HI & 0xf) - 7 < 3) {
@ -246,7 +247,7 @@ bool32 sub_0809953C(SmallIceBlockEntity* this) {
sub_0809969C(this);
break;
default:
if ((super->collisions & 0xe00) != 0) {
if ((super->collisions & COL_WEST_ANY) != COL_NONE) {
if ((u32)(super->x.HALF.HI & 0xf) - 7 < 3) {
super->x.HALF.HI = (super->x.HALF.HI & 0xfff0) + 8;
return TRUE;

11
src/player.c
View File

@ -6,6 +6,7 @@
*/
#include "global.h"
#include "collision.h"
#include "asm.h"
#include "sound.h"
#include "entity.h"
@ -3018,7 +3019,7 @@ static void sub_080739EC(Entity* this) {
if ((gPlayerState.jump_status & 0xC0) != 0) {
gPlayerState.field_0xd = this->direction;
if (gPlayerState.jump_status & 0x80)
this->collisions = 0;
this->collisions = COL_NONE;
v = GRAVITY_RATE;
} else {
if ((u16)sub_0806F854(this, 0, -12)) {
@ -3414,7 +3415,7 @@ void SurfaceAction_7(Entity* this) {
void SurfaceAction_MinishDoorFront(Entity* this) {
if ((this->y.HALF.HI & 0xF) <= 0xD) {
this->collisions = 0x6600;
this->collisions = COL_EAST_FULL | COL_WEST_FULL;
hide(this);
} else {
EnablePlayerDraw(this);
@ -3423,7 +3424,7 @@ void SurfaceAction_MinishDoorFront(Entity* this) {
void SurfaceAction_MinishDoorBack(Entity* this) {
if ((this->y.HALF.HI & 0xF) > 1) {
this->collisions = 0x6600;
this->collisions = COL_EAST_FULL | COL_WEST_FULL;
hide(this);
} else {
EnablePlayerDraw(this);
@ -3432,7 +3433,7 @@ void SurfaceAction_MinishDoorBack(Entity* this) {
void SurfaceAction_A(Entity* this) {
if ((this->x.HALF.HI & 0xF) < 12) {
this->collisions = 0x66;
this->collisions = COL_NORTH_FULL | COL_SOUTH_FULL;
hide(this);
} else {
EnablePlayerDraw(this);
@ -3441,7 +3442,7 @@ void SurfaceAction_A(Entity* this) {
void SurfaceAction_B(Entity* this) {
if ((this->x.HALF.HI & 0xF) > 4) {
this->collisions = 0x66;
this->collisions = COL_NORTH_FULL | COL_SOUTH_FULL;
hide(this);
} else {
EnablePlayerDraw(this);

3
src/projectile/arrowProjectile.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "object.h"
@ -66,7 +67,7 @@ void ArrowProjectile_Action1(Entity* this) {
}
void ArrowProjectile_Action2(Entity* this) {
if (this->collisions != 0) {
if (this->collisions != COL_NONE) {
this->action = 3;
COLLISION_OFF(this);
this->actionDelay = 0x20;

7
src/projectile/boneProjectile.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -25,15 +26,15 @@ void sub_080A81C4(Entity* this) {
void BoneProjectile_Init(Entity* this) {
this->action = 1;
this->actionDelay = 0x3c;
this->z.HALF.HI = 0xfffe;
this->actionDelay = 60;
this->z.HALF.HI = -2;
InitializeAnimation(this, 0);
}
void BoneProjectile_Action1(Entity* this) {
GetNextFrame(this);
ProcessMovement3(this);
if (this->collisions == 0) {
if (this->collisions == COL_NONE) {
if (IsProjectileOffScreen(this)) {
DeleteEntity(this);
} else {

3
src/projectile/cannonballProjectile.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -49,7 +50,7 @@ void CannonballProjectile_Action1(Entity* this) {
void CannonballProjectile_Action2(Entity* this) {
GetNextFrame(this);
ProcessMovement3(this);
if ((sub_080AB634(this) == 0) && (this->collisions != 0)) {
if ((sub_080AB634(this) == 0) && (this->collisions != COL_NONE)) {
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}

2
src/projectile/dekuSeedProjectile.c
View File

@ -91,7 +91,7 @@ void DekuSeedProjectile_Action2(Entity* this) {
COLLISION_ON(this);
}
} else {
sub_0800417E(this, (u32)this->collisions);
sub_0800417E(this, this->collisions);
sub_08016AD2(this);
InitializeAnimation(this, 0x19);
sub_080A86A0(this);

3
src/projectile/lakituLightning.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -32,7 +33,7 @@ void LakituLightning_Init(Entity* this) {
void LakituLightning_Action1(Entity* this) {
GetNextFrame(this);
ProcessMovement3(this);
if ((this->collisions != 0) || (--this->actionDelay == 0)) {
if ((this->collisions != COL_NONE) || (--this->actionDelay == 0)) {
CreateFx(this, FX_BLUE_EFC, 0);
DeleteThisEntity();
}

7
src/projectile/octorokBossProjectile.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
#include "projectile.h"
@ -114,10 +115,10 @@ void OctorokBossProjectile_Action1(Entity* this) {
this->field_0x78.HWORD--;
LinearMoveAngle(this, this->speed, this->direction);
CalculateEntityTileCollisions(this, this->direction >> 3, 0);
if ((this->collisions & 0xee00) != 0) {
if ((this->collisions & (COL_WEST_ANY | COL_EAST_ANY)) != COL_NONE) {
this->direction = -this->direction;
}
if ((this->collisions & 0xee) != 0) {
if ((this->collisions & (COL_NORTH_ANY | COL_SOUTH_ANY)) != COL_NONE) {
this->direction = -this->direction ^ 0x80;
}
if (this->direction == this->field_0xf) {
@ -151,7 +152,7 @@ void OctorokBossProjectile_Action1(Entity* this) {
GetNextFrame(this);
if (GravityUpdate(this, 0x1800) != 0) {
CalculateEntityTileCollisions(this, this->direction >> 3, 0);
if (this->collisions == 0) {
if (this->collisions == COL_NONE) {
LinearMoveAngle(this, (s32)this->speed, (u32)this->direction);
} else {
OctorokBossProjectile_Action2(this);

3
src/projectile/torchTrapProjectile.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -39,7 +40,7 @@ void TorchTrapProjectile_Action1(Entity* this) {
void TorchTrapProjectile_Action2(Entity* this) {
GetNextFrame(this);
ProcessMovement3(this);
if (this->collisions != 0) {
if (this->collisions != COL_NONE) {
DeleteThisEntity();
}
if (IsProjectileOffScreen(this)) {

3
src/projectile/v3ElectricProjectile.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "player.h"
#include "coord.h"
@ -96,7 +97,7 @@ void V3ElectricProjectile_Action2(Entity* this) {
this->z.HALF.HI += 3;
}
ProcessMovement3(this);
if (this->collisions != 0) {
if (this->collisions != COL_NONE) {
DeleteThisEntity();
}
GetNextFrame(this);

3
src/projectile/v3HandProjectile.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "player.h"
#include "functions.h"
@ -20,7 +21,7 @@ void V3HandProjectile_OnTick(Entity* this) {
this->z.HALF.HI += 2;
}
ProcessMovement3(this);
if (this->collisions != 0) {
if (this->collisions != COL_NONE) {
DeleteThisEntity();
}
GetNextFrame(this);

13
src/projectile/v3TennisBallProjectile.c
View File

@ -1,4 +1,5 @@
#include "entity.h"
#include "collision.h"
#include "enemy.h"
#include "functions.h"
@ -62,7 +63,7 @@ void V3TennisBallProjectile_Action1(Entity* this) {
void V3TennisBallProjectile_Action2(Entity* this) {
ProcessMovement3(this);
if (this->collisions != 0) {
if (this->collisions != COL_NONE) {
DeleteThisEntity();
}
GetNextFrame(this);
@ -78,28 +79,28 @@ bool32 sub_080ACB40(Entity* this) {
Entity* tmp = ((Entity**)(r1_grandparent->myHeap))[7]->child;
if (tmp != this && child == tmp->child) {
return 0;
return FALSE;
}
tmp = ((Entity**)(r1_grandparent->myHeap))[8]->child;
if (tmp != this && child == tmp->child) {
return 0;
return FALSE;
}
tmp = ((Entity**)(r1_grandparent->myHeap))[9]->child;
if (tmp != this && child == tmp->child) {
return 0;
return FALSE;
}
tmp = ((Entity**)(r1_grandparent->myHeap))[10]->child;
if (tmp != this && child == tmp->child) {
return 0;
return FALSE;
}
return 1;
return TRUE;
}
void sub_080ACB90(Entity* this) {