diff options
| author | Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com> | 2023-11-03 23:30:10 -0300 |
|---|---|---|
| committer | Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com> | 2023-11-03 23:30:10 -0300 |
| commit | e18669668a2c0545aac2eaf318b05ed9bc2cebc1 (patch) | |
| tree | 431a794a5030965a4fe4db8f1c5915e90be6d7f6 | |
| parent | c57f6f2a16503868575e3706d9d91531d926b3c1 (diff) | |
| parent | 761e18202066f6856919cc391fffe9f594829495 (diff) | |
Merge branch 'zret' of github.com:HarbourMasters/mm into zret
| -rw-r--r-- | src/overlays/actors/ovl_En_Bsb/z_en_bsb.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 33e5228f2..75956266e 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -761,9 +761,6 @@ void func_80C0CD90(EnBsb* this) { this->actionFunc = func_80C0CDE4; } -// regalloc -// https://decomp.me/scratch/vw91Q -#ifdef NON_MATCHING void func_80C0CDE4(EnBsb* this, PlayState* play) { f32 sp3C; f32 curFrame = this->skelAnime.curFrame; @@ -790,7 +787,7 @@ void func_80C0CDE4(EnBsb* this, PlayState* play) { this->unk_0F34.base.atFlags & AT_BOUNCED || temp_v0->stateFlags1 & 0x400000 && temp_fv0 <= 70.0f - && (temp_v1 = (temp_v0->actor.shape.rot.y - this->actor.shape.rot.y) + 0x8000, (temp_v1 < 0x2000) != 0) + && (temp_v1 = (temp_v0->actor.shape.rot.y - this->actor.shape.rot.y) + 0x8000, (temp_v1 < 0x2000)) && temp_v1 > -0x2000 ) { this->unk_0F34.base.atFlags &= ~(AT_BOUNCED|AT_HIT); @@ -805,9 +802,6 @@ void func_80C0CDE4(EnBsb* this, PlayState* play) { func_80C0C86C(this); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Bsb/func_80C0CDE4.s") -#endif void func_80C0CF4C(EnBsb* this) { this->actor.speed = 0.0f; |