falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #339 from hatal175/fxenum

This commit is contained in:
notyourav 2022-02-01 20:01:22 -08:00 committed by GitHub
parent a98b65a061 d7146c7f1b
commit c125fbb7f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/enemy/gyorgFemaleEye.c
View File

@ -110,7 +110,7 @@ void sub_08048B2C(GyorgFemaleEyeEntity* this) {
parent = (GyorgFemaleEntity*)super->parent;
if (sub_08048D70(parent)) {
if (!super->spriteSettings.draw) {
CreateFx(super, 2, 0x40);
CreateFx(super, FX_DEATH, 0x40);
}
super->spriteSettings.draw = 1;
} else {
@ -142,7 +142,7 @@ void sub_08048BB0(GyorgFemaleEyeEntity* this) {
super->flags &= ~ENT_COLLIDE;
super->spriteSettings.draw = 0;
InitializeAnimation(super, gUnk_080D2010[(super->animationState << 3) + super->type]);
CreateFx(super, 2, 0x40);
CreateFx(super, FX_DEATH, 0x40);
}
} else {
if ((parent->unk_80 >> super->type) & 1) {

4
src/npc/castorWildsStatue.c
View File

@ -126,7 +126,7 @@ void sub_080675D4(Entity* this) {
s32 i;
for (i = 0; i < 9; i++, gUnk++) {
Entity* ent = CreateFx(this, 2, 0);
Entity* ent = CreateFx(this, FX_DEATH, 0);
if (ent) {
ent->x.HALF.HI += gUnk->x;
ent->y.HALF.HI += gUnk->y;
@ -139,7 +139,7 @@ void sub_080675D4(Entity* this) {
};
gUnk = gUnk_08110E8A;
for (i = 0; i < 4; i++, gUnk++) {
Entity* ent = CreateFx(this, 4, 0);
Entity* ent = CreateFx(this, FX_ROCK, 0);
if (ent) {
ent->x.HALF.HI = gUnk->x + ent->x.HALF.HI;
ent->y.HALF.HI = gUnk->y + ent->y.HALF.HI;

4
src/object/gyorgBossObject.c
View File

@ -338,7 +338,7 @@ void sub_080A1DCC(GyorgBossObjectEntity* this) {
void sub_080A1E54(GyorgBossObjectEntity* this) {
Entity* fx;
if ((++super->actionDelay & 0x1F) == 0) {
fx = CreateFx(super, 0x51, 0);
fx = CreateFx(super, FX_GIANT_EXPLOSION4, 0);
if (fx) {
u32 r = Random();
fx->x.HALF.HI = gRoomControls.origin_x + 0x200 + (r & 0xf0) - 0x78;
@ -406,7 +406,7 @@ void sub_080A1FF0(GyorgBossObjectEntity* this) {
super->actionDelay--;
if (super->actionDelay <= 0x20 && (super->actionDelay & 0xF) == 0) {
Entity* fx;
fx = CreateFx(super, 0x51, 0);
fx = CreateFx(super, FX_GIANT_EXPLOSION4, 0);
if (fx) {
u32 r = Random();
fx->x.HALF.HI = gRoomControls.origin_x + 0x200 + (r & 0x78) - 0x3C;

4
src/projectile/v1DarkMagicProjectile.c
View File

@ -61,7 +61,7 @@ void sub_080AACE0(Entity* this) {
if (this->spriteSettings.draw == 1) {
this->spriteSettings.draw = 0;
this->field_0x86.HALF.LO = 1;
CreateFx(this, 2, 0);
CreateFx(this, FX_DEATH, 0);
}
parent = this->parent;
@ -80,7 +80,7 @@ void sub_080AACE0(Entity* this) {
}
if (this->field_0x86.HALF.LO == 0) {
CreateFx(this, 2, 0);
CreateFx(this, FX_DEATH, 0);
}
DeleteThisEntity();