mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-30 16:04:07 -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/manager/manager1.c
+16 -16
View File
@@ -60,7 +60,7 @@ static void sub_080570F8(void) {
}
void sub_08057118(Entity* this) {
this->actionDelay = 0;
this->timer = 0;
ZV(this)[0] = 0;
ZV(this)[1] = 0;
ZV(this)[2] = 0;
@@ -104,45 +104,45 @@ NONMATCH("asm/non_matching/manager1/sub_08057174.inc", void sub_08057174(Entity*
case 1:
if (ZV(this)[1] == 2) {
this->action = 3;
this->actionDelay = 9;
this->timer = 9;
}
break;
case 5:
if (ZV(this)[1] == 6) {
this->action = 3;
this->actionDelay = 9;
this->timer = 9;
}
break;
case 2:
if (ZV(this)[1] == 0) {
this->action = 2;
this->actionDelay = 0;
this->timer = 0;
ZV(this)[0] = 0;
}
break;
case 6:
if (ZV(this)[1] == 0) {
this->action = 2;
this->actionDelay = 0;
this->timer = 0;
}
break;
case 4:
if (ZV(this)[1] == 0) {
this->action = 2;
this->actionDelay = 0;
this->timer = 0;
this->z.WORD = 0;
}
break;
case 3:
if (ZV(this)[1] == 4) {
this->action = 3;
this->actionDelay = 9;
this->timer = 9;
}
break;
}
if (this->action != 1) {
this->field_0xf = 8;
this->subtimer = 8;
ZV(this)[1] = prop->unk0;
ZV(this)[2] = 1;
return;
@@ -154,11 +154,11 @@ NONMATCH("asm/non_matching/manager1/sub_08057174.inc", void sub_08057174(Entity*
END_NONMATCH
void sub_0805728C(Entity* this) {
if (--this->field_0xf == 0) {
this->field_0xf = 8;
gScreen.controls.alphaBlend = gUnk_08107C1C[this->actionDelay++];
if (--this->subtimer == 0) {
this->subtimer = 8;
gScreen.controls.alphaBlend = gUnk_08107C1C[this->timer++];
if (this->actionDelay == 10) {
if (this->timer == 10) {
this->action = 1;
ZV(this)[2] = 0;
}
@@ -166,11 +166,11 @@ void sub_0805728C(Entity* this) {
}
void sub_080572D4(Entity* this) {
if (--this->field_0xf == 0) {
this->field_0xf = 8;
gScreen.controls.alphaBlend = gUnk_08107C1C[this->actionDelay--];
if (--this->subtimer == 0) {
this->subtimer = 8;
gScreen.controls.alphaBlend = gUnk_08107C1C[this->timer--];
if (this->actionDelay == 0xff) {
if (this->timer == 0xff) {
this->action = 1;
ZV(this)[2] = 0;
ZV(this)[1] = 0;
src/manager/manager17.c
+1 -1
View File
@@ -35,7 +35,7 @@ void sub_0805AD80(Manager17* manager) {
if (CheckFlags(manager->field_0x3e) != 0) {
Entity* object = CreateObject(GROUND_ITEM, manager->manager.unk_0a, manager->manager.unk_0b);
if (object != NULL) {
object->actionDelay = manager->field_0x35;
object->timer = manager->field_0x35;
object->collisionLayer = manager->field_0x36;
object->x.HALF.HI = manager->field_0x38 + gRoomControls.origin_x;
object->y.HALF.HI = manager->field_0x3a + gRoomControls.origin_y;
src/manager/manager21.c
+3 -3
View File
@@ -15,7 +15,7 @@ typedef struct {
u16 x;
u16 y;
u16 field_0x4;
u16 actionDelay;
u16 timer;
} MinishEntranceSpawnData;
bool32 sub_0805B8CC(u32);
@@ -38,8 +38,8 @@ void Manager21_Main(Manager21* this) {
if (((this->field_0x20 & (1 << count)) == 0) && (sub_0805B8CC(spawnData->field_0x4) != 0)) {
Entity* object = CreateObject(MINISH_SIZED_ENTRANCE, 1, 0);
if (object != NULL) {
object->actionDelay = spawnData->actionDelay;
object->field_0xf = count;
object->timer = spawnData->timer;
object->subtimer = count;
object->x.HALF.HI = gRoomControls.origin_x + spawnData->x;
object->y.HALF.HI = gRoomControls.origin_y + spawnData->y;
object->parent = (Entity*)this;
src/manager/manager26.c
+1 -1
View File
@@ -38,7 +38,7 @@ void sub_0805C6D0(Manager26* this) {
Entity* obj;
obj = CreateObject(PUSHABLE_FURNITURE, tmp->unk_01, tmp->unk_02);
if (obj) {
obj->actionDelay = tmp->unk_03;
obj->timer = tmp->unk_03;
obj->x.HALF.HI = gRoomControls.origin_x + tmp->unk_04;
obj->y.HALF.HI = gRoomControls.origin_y + tmp->unk_06;
obj->parent = (Entity*)this;
src/manager/manager27.c
+10 -10
View File
@@ -35,14 +35,14 @@ void sub_0805C874(Entity* this) {
this->action = 1;
}
this->actionDelay = 1;
this->field_0xf = 0;
this->timer = 1;
this->subtimer = 0;
}
void sub_0805C894(Entity* this) {
if (sub_0805C920(this)) {
this->action = 2;
this->actionDelay = 1;
this->timer = 1;
SoundReq(SFX_EM_ARMOS_ON);
}
}
@@ -51,14 +51,14 @@ void sub_0805C8B4(Entity* this) {
u8 bVar1;
int iVar2;
if (--this->actionDelay == 0) {
this->actionDelay = 0x14;
if (--this->timer == 0) {
this->timer = 0x14;
if (5 < ++this->field_0xf) {
this->field_0xf = 0;
if (5 < ++this->subtimer) {
this->subtimer = 0;
}
LoadPaletteGroup(gUnk_08108D20[this->field_0xf]);
if (this->field_0xf == 0) {
LoadPaletteGroup(gUnk_08108D20[this->subtimer]);
if (this->subtimer == 0) {
SoundReq(SFX_EM_ARMOS_ON);
}
}
@@ -68,7 +68,7 @@ void sub_0805C8B4(Entity* this) {
}
void sub_0805C908(Entity* this) {
if (this->field_0xf == 0) {
if (this->subtimer == 0) {
this->action = 1;
} else {
sub_0805C8B4(this);
src/manager/manager31.c
+2 -2
View File
@@ -63,8 +63,8 @@ void Manager31_Main(Manager31* this) {
Entity* object =
CreateObject(SHOP_ITEM, 0x5c, ((s32)Random() % spawnData->maxType) + spawnData->minType);
if (object != NULL) {
object->actionDelay = 1;
object->field_0xf = count;
object->timer = 1;
object->subtimer = count;
object->x.HALF.HI = spawnData->x + gRoomControls.origin_x;
object->y.HALF.HI = spawnData->y + gRoomControls.origin_y;
object->field_0x80.HWORD = spawnData->x;
src/manager/manager38.c
+3 -3
View File
@@ -14,7 +14,7 @@ void sub_0805E0C0(Entity* this) {
Entity* entity;
this->action = 1;
this->actionDelay = 0;
this->timer = 0;
entityData = (EntityData*)GetCurrentRoomProperty(this->type);
if (entityData == NULL) {
DeleteThisEntity();
@@ -22,10 +22,10 @@ void sub_0805E0C0(Entity* this) {
while (*(u8*)entityData != 0xff) {
entity = LoadRoomEntity(entityData++);
entity->parent = this;
entity->actionDelay = 0xff;
entity->timer = 0xff;
}
}
void sub_0805E0F4(Entity* this) {
this->actionDelay = 0;
this->timer = 0;
}
src/manager/managerF.c
+1 -1
View File
@@ -179,7 +179,7 @@ void sub_08059064(ManagerF* this) {
tmp = CreateObject(GROUND_ITEM, ITEM_SMALL_KEY, 0);
if (!tmp)
return;
tmp->actionDelay = 2;
tmp->timer = 2;
tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x;
tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y;
}