mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-30 00:47:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use PlayerFlags where possible

Browse Source
This commit is contained in:
Tal Hayon
2022-01-29 16:21:57 +02:00
parent d34aa9166f
commit b4f8429a2c
16 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/flyingSkull.c
+1 -1
View File
@@ -133,7 +133,7 @@ void sub_08039DD8(FlyingSkullEntity* this) {
sub_08078930(super);
} else {
if ((gPlayerState.flags & 0x80) == 0) {
if ((gPlayerState.flags & PL_MINISH) == 0) {
Entity* ent = &gPlayerEntity;
if (EntityWithinDistance(super, ent->x.HALF.HI, ent->y.HALF.HI, 0x30)) {
if (super->type == 1) {
src/enemy/likeLike.c
+1 -1
View File
@@ -213,7 +213,7 @@ void sub_0802805C(Entity* this) {
NONMATCH("asm/non_matching/likeLike/sub_0802810C.inc", void sub_0802810C(Entity* this)) {
gPlayerState.jump_status = 0x41;
gPlayerState.field_0xa = 0;
gPlayerState.flags &= 0xffffffef;
gPlayerState.flags &= PL_CAPTURED;
gPlayerEntity.flags |= ENT_COLLIDE;
gPlayerEntity.zVelocity = Q_16_16(1.5);
gPlayerEntity.iframes = -60;
src/enemy/moldworm.c
+1 -1
View File
@@ -91,7 +91,7 @@ void sub_080230E4(Entity* this) {
gPlayerEntity.direction = 0xff;
gPlayerEntity.iframes = -0x14;
gPlayerState.jump_status = 0x41;
gPlayerState.flags &= 0xfff7ffff;
gPlayerState.flags &= ~PL_MOLDWORM_CAPTURED;
}
sub_0804AA30(this, gUnk_080CBC38);