mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-27 06:45:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on castorWildStatue

Browse Source
This commit is contained in:
Tal Hayon
2022-01-07 04:42:12 +02:00
parent c437387f02
commit 4023a0b288
3 changed files with 101 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/castorWildsStatue.c
+83 -3
View File
@@ -15,6 +15,13 @@ extern s8 gUnk_08110E64[];
extern u32 gUnk_08110E68[];
typedef struct {
s8 x;
s8 y;
} PACKED PosOffset;
extern PosOffset gUnk_08110E78[];
extern PosOffset gUnk_08110E8A[];
void CastorWildsStatue(Entity* this) {
if ((this->flags & 2) != 0) {
gUnk_08110E5C[this->action](this);
@@ -113,14 +120,87 @@ void sub_0806757C(Entity* this) {
}
}
ASM_FUNC("asm/non_matching/castorWildsStatue/sub_080675D4.inc", void sub_080675D4(Entity* this))
NONMATCH("asm/non_matching/castorWildsStatue/sub_080675D4.inc", void sub_080675D4(Entity* this)) {
PosOffset* gUnk = gUnk_08110E78;
u32 subAction = (this->subAction << 2) - 0xc;
s32 index = 8;
do {
Entity* ent = CreateFx(this, 2, 0);
if (ent) {
ent->x.HALF.HI = gUnk->x + ent->x.HALF.HI;
ent->y.HALF.HI = gUnk->y + ent->y.HALF.HI;
ent->z.HALF.HI = subAction;
ent->collisionLayer = this->collisionLayer;
ent->spriteOrientation.flipY = this->spriteOrientation.flipY;
ent->spriteRendering.b3 = this->spriteRendering.b3;
ResolveEntityOnTop(this, ent);
}
index--;
gUnk += 1;
} while (index >= 0);
gUnk = gUnk_08110E8A;
index = 3;
do {
Entity* ent = CreateFx(this, 4, 0);
if (ent) {
ent->x.HALF.HI = gUnk->x + ent->x.HALF.HI;
ent->y.HALF.HI = gUnk->y + ent->y.HALF.HI;
ent->z.HALF.HI = subAction;
ent->collisionLayer = this->collisionLayer;
ent->spriteOrientation.flipY = this->spriteOrientation.flipY;
ent->spriteRendering.b3 = this->spriteRendering.b3;
ResolveEntityOnTop(this, ent);
}
index--;
gUnk += 1;
} while (index >= 0);
if (this->subAction > 2) {
this->spriteSettings.draw = 0;
}
}
END_NONMATCH
void sub_080676D8(Entity* this) {
this->subAction += 1;
}
ASM_FUNC("asm/non_matching/castorWildsStatue/sub_080676E0.inc",
void sub_080676E0(Entity* this, ScriptExecutionContext* context))
void sub_080676E0(Entity* this, ScriptExecutionContext* context) {
switch (context->unk_18) {
case 0: {
context->unk_18 = 1;
context->unk_19 = 0x20;
break;
}
case 1: {
this->z.HALF.HI = (context->unk_19 >> 1) - 0x10;
if (--context->unk_19 == 0) {
context->unk_18 = 2;
context->unk_19 = 0x24;
}
break;
}
case 2: {
if (--context->unk_19 == 0) {
context->unk_18 = 3;
}
break;
}
default: {
if (GravityUpdate(this, 0x1800) == 0) {
return;
}
break;
}
}
gActiveScriptInfo.commandSize = 0;
}
void CastorWildsStatue_Fusion(Entity* this) {
if (this->action == 0) {