mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-14 20:43:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into asset-extraction

Browse Source
This commit is contained in:
octorock
2021-11-12 12:13:13 +01:00
parent b1e2175ffb
commit 9396484df6
340 changed files with 4576 additions and 6192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/object7E.c
+5 -5
View File
@@ -12,15 +12,15 @@ void Object7E(Entity* this) {
this->spritePriority.b0 = 7;
this->frameIndex = 0x28;
if (this->type == 0) {
this->spriteSettings.b.draw = TRUE;
this->spriteSettings.draw = TRUE;
} else if (this->type == 2) {
this->spriteSettings.b.flipX = TRUE;
this->spriteSettings.flipX = TRUE;
}
}
PositionRelative(this->parent, this, 0, 0x80000);
this->height.HALF.HI = 0;
this->z.HALF.HI = 0;
if (this->type != 0) {
this->spriteSettings.b.draw = this->attachedEntity->spriteSettings.b.draw;
this->frameIndex = this->attachedEntity->frameIndex + 0x1f;
this->spriteSettings.draw = this->child->spriteSettings.draw;
this->frameIndex = this->child->frameIndex + 0x1f;
}
}