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

name remaining entity fields

Browse Source
This commit is contained in:
theo3
2022-03-28 19:51:32 -07:00
parent 755571834d
commit 92240d4314
348 changed files with 3850 additions and 3850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/object35.c
+12 -12
View File
@@ -60,15 +60,15 @@ void Object35_Type0Init(Object35Entity* this) {
super->collisionLayer = 2;
UpdateSpriteForCollisionLayer(super);
super->spritePriority.b0 = 1;
super->actionDelay = -0x4c;
super->timer = -0x4c;
InitializeAnimation(super, super->type2);
}
void Object35_Type0Action1(Object35Entity* this) {
s8 tmp;
GetNextFrame(super);
if (--super->actionDelay == 0) {
super->actionDelay = -0x4c;
if (--super->timer == 0) {
super->timer = -0x4c;
super->type2++;
tmp = 3;
super->type2 = super->type2 % tmp;
@@ -97,22 +97,22 @@ void Object35_Type1Init(Object35Entity* this) {
super->spritePriority.b0 = 5;
this->unk_76 = COORD_TO_TILE(super);
this->unk_74 = GetTileIndex(this->unk_76, super->collisionLayer);
if (super->actionDelay == 0) {
if (super->timer == 0) {
super->action = 1;
super->field_0xf = 0x78;
super->subtimer = 0x78;
SetTile(0x4022, this->unk_76, super->collisionLayer);
} else {
super->action = 3;
super->spriteSettings.draw = 0;
super->spriteSettings.flipY = 1;
super->actionDelay = 0;
super->timer = 0;
}
}
void Object35_Type1Action1(Object35Entity* this) {
if (CheckRoomFlag(0)) {
super->action = 2;
super->actionDelay = 7;
super->timer = 7;
super->direction = 0;
SetTile(this->unk_74, this->unk_76, super->collisionLayer);
EnqueueSFX(SFX_10B);
@@ -121,9 +121,9 @@ void Object35_Type1Action1(Object35Entity* this) {
void Object35_Type1Action2(Object35Entity* this) {
LinearMoveUpdate(super);
if (--super->actionDelay == 0) {
if (--super->timer == 0) {
super->action = 5;
super->actionDelay = 8;
super->timer = 8;
super->spriteSettings.draw = 0;
super->x.HALF.HI = this->unk_70;
super->y.HALF.HI = this->unk_72;
@@ -139,7 +139,7 @@ void Object35_Type1Action3(Object35Entity* this) {
void Object35_Type1Action4(Object35Entity* this) {
LinearMoveUpdate(super);
if (--super->actionDelay == 0) {
if (--super->timer == 0) {
super->action = 5;
sub_08083814(super, 2);
EnqueueSFX(SFX_10B);
@@ -160,7 +160,7 @@ void Object35_Type2(Object35Entity* this) {
void Object35_Type2Init(Object35Entity* this) {
super->action = 1;
super->actionDelay = 0x10;
super->timer = 0x10;
super->z.HALF.HI -= 0x10;
if (super->type2 == 0) {
super->frameIndex = 2;
@@ -174,7 +174,7 @@ void Object35_Type2Init(Object35Entity* this) {
}
void Object35_Type2Action1(Object35Entity* this) {
if (--super->actionDelay == 0) {
if (--super->timer == 0) {
DeleteThisEntity();
}
}