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

True match Enemy50_OnCollision

This commit is contained in:
KEKW555 2023-12-24 11:52:42 +05:30 committed by GitHub
parent c1571218ae
commit 20b4cf6724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/enemy/enemy50.c
View File

@ -82,13 +82,11 @@ void Enemy50_OnCollision(Enemy50Entity* this) {
sub_08041134(this); sub_08041134(this);
sub_0803F6EC(this); sub_0803F6EC(this);
} }
if (super->hitType == 0x25) { if (super->hitType == 0x25 && super->contactFlags == 0x80) {
if (super->contactFlags == 0x80) {
super->action = 8; super->action = 8;
InitializeAnimation(super, 3); InitializeAnimation(super, 3);
goto _08040C9C; } else {
} if (super->contactFlags == 0x80) {
} else if (super->contactFlags == 0x80) {
this->unk_7c = 0x78; this->unk_7c = 0x78;
sub_08041128(this); sub_08041128(this);
} }
@ -115,7 +113,7 @@ void Enemy50_OnCollision(Enemy50Entity* this) {
} }
this->unk_7a = super->health; this->unk_7a = super->health;
} }
_08040C9C: }
EnemyFunctionHandlerAfterCollision(super, Enemy50_Functions); EnemyFunctionHandlerAfterCollision(super, Enemy50_Functions);
} }