mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

improve matches (#1413)

Browse source
This commit is contained in:
engineer124 2022-10-21 18:57:30 -04:00 • committed by GitHub
parent 26d6028ff1
commit a715bf63d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 45 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -663,7 +663,7 @@ void func_80A75C38(EnIk* this, PlayState* play) {
u8 pad;
u8 pad2;
u8 prevHealth;
s32 temp_v0_3;
s32 pad3;
Vec3f sp38;
if ((this->unk_2F8 == 3) || (this->unk_2F8 == 2)) {
@ -684,12 +684,9 @@ void func_80A75C38(EnIk* this, PlayState* play) {
sp38 = this->actor.world.pos;
sp38.y += 50.0f;
Actor_SetDropFlag(&this->actor, &this->bodyCollider.info, true);
temp_v0_3 = this->actor.colChkInfo.damageEffect;
this->unk_2FD = temp_v0_3 & 0xFF;
this->unk_2FD = this->actor.colChkInfo.damageEffect;
this->bodyCollider.base.acFlags &= ~AC_HIT;
if (1) {}
if ((this->unk_2FD == 0) || (this->unk_2FD == 0xD) || ((this->unk_2FB == 0) && (this->unk_2FD == 0xE))) {
if (this->unk_2FD != 0) {
CollisionCheck_SpawnShieldParticlesMetal(play, &sp38);