mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-04 02:47:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cleanup_declarations

Browse Source
This commit is contained in:
Henny022p
2021-03-15 22:56:23 +01:00
parent aac7eb7436 e09678c6ab
commit a2cdfd6d8d
549 changed files with 18187 additions and 4914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/objectB2.c
+2 -2
View File
@@ -22,12 +22,12 @@ void ObjectB2(Entity* this) {
this->attachedEntity = pEVar3;
InitializeAnimation(this, this->type);
}
this->nonPlanarMovement = this->parent->nonPlanarMovement;
this->speed = this->parent->speed;
sub_0806F69C(this);
if (sub_080AE4CC(this->attachedEntity, this->x.HALF.HI, this->y.HALF.HI, 9) != 0) {
DeleteThisEntity();
}
if (this->nonPlanarMovement < 0x41) {
if (this->speed < 0x41) {
this->spriteSettings.b.draw ^= 1;
if (--this->actionDelay == 0) {