mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-08 11:45:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile a few functions in objectutils

Browse Source
This commit is contained in:
Tal Hayon
2022-02-27 05:56:38 +02:00
parent 4e10e89cca
commit 640810a005
9 changed files with 53 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/bigIceBlock.c
+1 -1
View File
@@ -91,7 +91,7 @@ void BigIceBlock_Action2(BigIceBlockEntity* this) {
if (super->type != 2) {
SetFlag(this->unk_86);
} else {
sub_080A2A3C(super, 0x53, 0, this->unk_86);
CreateGroundItemWithFlags(super, 0x53, 0, this->unk_86);
}
}
super->action = 3;
src/object/object68.c
+1 -1
View File
@@ -66,7 +66,7 @@ void sub_08094774(Object68Entity* this) {
}
break;
case 2:
child = sub_080A2A20(&gPlayerEntity, 0x60, 0);
child = CreateGroundItem(&gPlayerEntity, 0x60, 0);
super->child = child;
if (child != NULL) {
child->actionDelay = 1;
src/object/smallIceBlock.c
+2 -2
View File
@@ -138,10 +138,10 @@ void SmallIceBlock_Action3(SmallIceBlockEntity* this) {
}
sub_0805EC9C(super, 0x100, gUnk_08123748[super->actionDelay >> 5], 0);
if (super->type == 1) {
sub_080A2A3C(super, 0x53, 0, this->unk_86);
CreateGroundItemWithFlags(super, 0x53, 0, this->unk_86);
SoundReq(SFX_SECRET);
} else if (super->type == 2) {
sub_080A2A3C(super, 0x52, 0, this->unk_86);
CreateGroundItemWithFlags(super, 0x52, 0, this->unk_86);
SoundReq(SFX_SECRET);
}
super->action = 4;
src/objectUtils.c
+42 -8
View File
@@ -97,20 +97,20 @@ u32 LoadObjectSprite(Entity* this, s32 type, const ObjectDefinition* definition)
return 2;
}
Entity* CreateObject(u32 subtype, u32 form, u32 parameter) {
Entity* CreateObject(u32 subtype, u32 form, u32 type2) {
Entity* entity = GetEmptyEntity();
if (entity != NULL) {
entity->kind = OBJECT;
entity->id = subtype;
entity->type = form;
entity->type2 = parameter;
entity->type2 = type2;
AppendEntityToList(entity, 6);
}
return entity;
}
Entity* CreateObjectWithParent(Entity* parent, u32 subtype, u32 form, u32 parameter) {
Entity* entity = CreateObject(subtype, form, parameter);
Entity* CreateObjectWithParent(Entity* parent, u32 subtype, u32 form, u32 type2) {
Entity* entity = CreateObject(subtype, form, type2);
if (entity != NULL) {
entity->parent = parent;
CopyPosition(parent, entity);
@@ -150,23 +150,23 @@ void CreateWaterSplash(Entity* parent) {
CreateFx(parent, FX_WATER_SPLASH, 0);
}
Entity* sub_080A2A20(Entity* parent, u32 form, u32 parameter) {
Entity* CreateGroundItem(Entity* parent, u32 form, u32 subtype) {
Entity* ent;
ent = CreateObjectWithParent(parent, GROUND_ITEM, form, parameter);
ent = CreateObjectWithParent(parent, GROUND_ITEM, form, subtype);
if (ent != NULL) {
ent->actionDelay = 5;
}
return ent;
}
Entity* sub_080A2A3C(Entity* parent, u32 form, u32 subtype, u32 param_4) {
Entity* CreateGroundItemWithFlags(Entity* parent, u32 form, u32 subtype, u32 flags) {
Entity* ent;
ent = CreateObjectWithParent(parent, GROUND_ITEM, form, subtype);
if (ent != NULL) {
ent->actionDelay = 5;
ent->field_0x86.HWORD = param_4;
ent->field_0x86.HWORD = flags;
}
return ent;
}
@@ -180,3 +180,37 @@ Entity* CreateWaterTrace(Entity* parent) {
}
return ent;
}
void CreateRandomWaterTrace(Entity* parent, int range) {
s32 sVar1, sVar2, sVar3;
Entity* ent;
u32 uVar3;
ent = CreateWaterTrace(parent);
if (ent != NULL) {
uVar3 = Random();
sVar1 = (int)uVar3 % (++range);
uVar3 >>= 8;
if ((uVar3 & 1) != 0) {
sVar1 = -sVar1;
}
ent->x.HALF.HI += sVar1;
uVar3 >>= 8;
sVar2 = (int)uVar3 % range;
uVar3 >>= 8;
if ((uVar3 & 1) != 0) {
sVar2 = -sVar2;
}
ent->y.HALF.HI += sVar2;
}
}
Entity* CreateLargeWaterTrace(Entity* parent) {
Entity* ent;
ent = CreateFx(parent, FX_RIPPLE_LARGE, 0);
if (ent != NULL) {
ent->spritePriority.b0 = 7;
}
return ent;
}