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

Fix renamed functions in EnDodongo (#285)

This commit is contained in:
Anghelo Carvajal 2021-09-01 21:25:29 -04:00 committed by GitHub
parent 6fb180d0e1
commit e6b73951c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
View File

@ -762,7 +762,7 @@ void func_80877E60(EnDodongo* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION); Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
if (this->actor.colChkInfo.health <= 4) { if (this->actor.colChkInfo.health <= 4) {
this->actor.colChkInfo.health = 0; this->actor.colChkInfo.health = 0;
func_800BBA88(globalCtx, &this->actor); Enemy_StartFinishingBlow(globalCtx, &this->actor);
} else { } else {
this->actor.colChkInfo.health -= 4; this->actor.colChkInfo.health -= 4;
} }
@ -986,8 +986,8 @@ void EnDodongo_UpdateDamage(EnDodongo* this, GlobalContext* globalCtx) {
((this->unk_300 != 10) || !(this->collider1.elements[i].info.acHitInfo->toucher.dmgFlags & 0xDB0B3))) { ((this->unk_300 != 10) || !(this->collider1.elements[i].info.acHitInfo->toucher.dmgFlags & 0xDB0B3))) {
func_80876D28(this, globalCtx); func_80876D28(this, globalCtx);
if (this->actor.colChkInfo.damageEffect != 0xF) { if (this->actor.colChkInfo.damageEffect != 0xF) {
if (!func_800BE22C(&this->actor)) { if (!Actor_ApplyDamage(&this->actor)) {
func_800BBA88(globalCtx, &this->actor); Enemy_StartFinishingBlow(globalCtx, &this->actor);
if (this->actor.colChkInfo.damageEffect == 3) { if (this->actor.colChkInfo.damageEffect == 3) {
func_80876CAC(this); func_80876CAC(this);
this->timer = 3; this->timer = 3;