diff options
| author | Tony Jih <tonyjih@gmail.com> | 2023-12-27 05:51:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-26 13:51:42 -0800 |
| commit | dae4c669913c3dc4248291f2d843ac39525b2738 (patch) | |
| tree | 58ea4c99503095d268b970e020689f23b4fa7678 /src | |
| parent | bd44f07fa6182880f765c5f6a504e7064eef4770 (diff) | |
True match Object70_Action1 (#668)
Diffstat (limited to 'src')
| -rw-r--r-- | src/object/object70.c | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/src/object/object70.c b/src/object/object70.c index 8cc5a576..efe82743 100644 --- a/src/object/object70.c +++ b/src/object/object70.c @@ -35,23 +35,19 @@ void Object70_Init(Entity* this) { } void Object70_Action1(Entity* this) { - u8 bVar1; if (this->type == 0) { - if (gPlayerEntity.z.WORD == 0) { - if ((((gPlayerState.dash_state & 0x40) == 0) && (gPlayerState.floor_type == SURFACE_SWAMP)) && - ((gPlayerEntity.action == PLAYER_NORMAL || - ((gPlayerEntity.action == PLAYER_ROLL || (gPlayerEntity.action == PLAYER_JUMP)))))) { - goto _080974FA; - } else { - if (gPlayerEntity.z.WORD == 0) { - CreateFx(&gPlayerEntity, FX_GREEN_SPLASH, 0); - } + if (gPlayerEntity.z.WORD != 0 || (gPlayerState.dash_state & 0x40) != 0 || + gPlayerState.floor_type != SURFACE_SWAMP || + (gPlayerEntity.action != PLAYER_NORMAL && gPlayerEntity.action != PLAYER_ROLL && + gPlayerEntity.action != PLAYER_JUMP)) { + if (gPlayerEntity.z.WORD == 0) { + CreateFx(&gPlayerEntity, FX_GREEN_SPLASH, 0); } + + gPlayerEntity.spriteOrientation.flipY = 2; + DeleteThisEntity(); } - gPlayerEntity.spriteOrientation.flipY = 2; - DeleteThisEntity(); - _080974FA: this->x = gPlayerEntity.x; this->y = gPlayerEntity.y; if (gPlayerState.jump_status == 0) { @@ -62,15 +58,15 @@ void Object70_Action1(Entity* this) { this->spritePriority.b0 = 7; } } + return; + } - } else { - if (gPlayerEntity.action != PLAYER_USEENTRANCE) { - if (this->collisionLayer == 1) { - gPlayerEntity.spriteOrientation.flipY = 2; - } else { - gPlayerEntity.spriteOrientation.flipY = 1; - } - DeleteThisEntity(); + if (gPlayerEntity.action != PLAYER_USEENTRANCE) { + if (this->collisionLayer == 1) { + gPlayerEntity.spriteOrientation.flipY = 2; + } else { + gPlayerEntity.spriteOrientation.flipY = 1; } + DeleteThisEntity(); } } |