mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-07 03:19:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use FX enum and add another sparkle to the enum

Browse Source
This commit is contained in:
Tal Hayon
2022-11-21 19:17:21 +02:00
parent 1ceeac3c84
commit bf9df14832
16 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/bigIceBlock.c
+1 -1
View File
@@ -116,7 +116,7 @@ void sub_08099880(BigIceBlockEntity* this) {
uVar4 = (0x3c - super->timer) * 0x20 + 0x100;
SetAffineInfo(super, 0x100, uVar4, 0);
sub_0806FCF4(super, uVar4, 2, 0);
obj = CreateObject(SPECIAL_FX, 0x11, 0x40);
obj = CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (obj != NULL) {
rand = Random();
x = ((rand >> 0x10) % 0x21) - 0x10;
src/object/frozenWaterElement.c
+2 -2
View File
@@ -92,7 +92,7 @@ void FrozenWaterElement_Action2(FrozenWaterElementEntity* this) {
super->spriteOffsetY += 8;
}
value = gUnk_08123DC0[this->unk_74 >> 5];
effect = CreateObject(SPECIAL_FX, 0x11, 0x40);
effect = CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (effect != NULL) {
rand = Random();
tmp = (((rand >> 0x10) & value) - ((value + 1) >> 1));
@@ -101,7 +101,7 @@ void FrozenWaterElement_Action2(FrozenWaterElementEntity* this) {
effect->x.HALF.HI = this->unk_80 + gRoomControls.origin_x + tmp;
effect->y.HALF.HI = this->unk_82 + gRoomControls.origin_y + tmp2;
}
effect = CreateObject(SPECIAL_FX, 2, 0x40);
effect = CreateObject(SPECIAL_FX, FX_DEATH, 0x40);
if (effect != NULL) {
rand = Random();
tmp = (((rand >> 0x10) & value) - ((value + 1) >> 1));
src/object/gyorgBossObject.c
+1 -1
View File
@@ -437,7 +437,7 @@ void GyorgBossObject_SpawnChildren(u32 unk0, bool32 fromBlue, u32 animationState
}
if (fromBlue == FALSE) {
Entity* tmp;
tmp = CreateObject(SPECIAL_FX, 2, 0);
tmp = CreateObject(SPECIAL_FX, FX_DEATH, 0);
if (tmp) {
tmp->x.HALF.HI = x;
tmp->y.HALF.HI = y;
src/object/objectOnPillar.c
+3 -3
View File
@@ -166,7 +166,7 @@ bool32 sub_08097008(ObjectOnPillarEntity* this) {
this->tileIndex = tileType;
break;
default:
effect = CreateObject(SPECIAL_FX, 4, 0);
effect = CreateObject(SPECIAL_FX, FX_ROCK, 0);
if (effect != NULL) {
CopyPosition(super, effect);
}
@@ -244,11 +244,11 @@ void sub_080971E0(ObjectOnPillarEntity* this) {
EntityWithHitFlag* entity;
u32 tilePosition;
entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, 0x11, 0x40);
entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (entity != NULL) {
PositionRelative(super, &entity->base, -0x80000, 0x20000);
}
entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, 0x11, 0x40);
entity = (EntityWithHitFlag*)CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (entity != NULL) {
PositionRelative(super, &entity->base, 0x80000, 0x20000);
}
src/object/pushableStatue.c
+3 -3
View File
@@ -71,7 +71,7 @@ void PushableStatue_Action1(PushableStatueEntity* this) {
sub_08089538(this);
break;
case 0:
obj = CreateObject(SPECIAL_FX, 4, 0);
obj = CreateObject(SPECIAL_FX, FX_ROCK, 0);
if (obj != NULL) {
CopyPosition(super, obj);
}
@@ -118,7 +118,7 @@ void PushableStatue_SubAction0(PushableStatueEntity* this) {
sub_08089538(this);
break;
case 0:
obj = CreateObject(SPECIAL_FX, 4, 0);
obj = CreateObject(SPECIAL_FX, FX_ROCK, 0);
if (obj != NULL) {
CopyPosition(super, obj);
}
@@ -216,7 +216,7 @@ bool32 sub_080895C0(PushableStatueEntity* this) {
sub_08089454(this);
return TRUE;
}
obj = CreateObject(SPECIAL_FX, 4, 0);
obj = CreateObject(SPECIAL_FX, FX_ROCK, 0);
if (obj != NULL) {
CopyPosition(super, obj);
}
src/object/smallIceBlock.c
+2 -2
View File
@@ -98,7 +98,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) {
sub_080994B8(this);
break;
case 0:
obj = CreateObject(SPECIAL_FX, 0xd, 0);
obj = CreateObject(SPECIAL_FX, FX_ICE, 0);
if (obj != NULL) {
CopyPosition(super, obj);
}
@@ -165,7 +165,7 @@ void SmallIceBlock_Action4(SmallIceBlockEntity* this) {
}
SetAffineInfo(super, 0x100, (0x3c - super->timer) * 0x20 + 0x100, 0);
if ((super->timer & 1) != 0) {
obj = CreateObject(SPECIAL_FX, 0x11, 0x40);
obj = CreateObject(SPECIAL_FX, FX_DASH, 0x40);
if (obj != NULL) {
rand = Random();
x = ((rand >> 0x10) % 9) - 4;