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

add effects.h

Browse Source
This commit is contained in:
theo3
2021-10-26 20:33:33 -07:00
parent 3f5449c1a1
commit d29468c30b
67 changed files with 297 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/projectile/cannonballProjectile.c
+4 -3
View File
@@ -1,6 +1,7 @@
#include "entity.h"
#include "enemy.h"
#include "functions.h"
#include "effects.h"
extern void CreateItemOnGround(Entity*);
extern s32 sub_080AF090(Entity*);
@@ -46,7 +47,7 @@ void CannonballProjectile_Init(Entity* this) {
void CannonballProjectile_Action1(Entity* this) {
GetNextFrame(this);
if (sub_080AF090(this) == 0) {
CreateFx(this, 2, 0);
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}
sub_080AB5F4(this);
@@ -56,7 +57,7 @@ void CannonballProjectile_Action2(Entity* this) {
GetNextFrame(this);
sub_080AF090(this);
if ((sub_080AB634(this) == 0) && (this->collisions != 0)) {
CreateFx(this, 2, 0);
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}
}
@@ -85,7 +86,7 @@ bool32 sub_080AB634(Entity* this) {
entities[i]->action = 3;
entities[i]->actionDelay = 0x1e;
entities[i]->spriteSettings.b.draw = 0;
CreateFx(entities[i], 0x45, 0);
CreateFx(entities[i], FX_WHITE_ROCK, 0);
}
DeleteEntity(this);
return TRUE;
src/projectile/dirtBallProjectile.c
+5 -4
View File
@@ -3,6 +3,7 @@
#include "player.h"
#include "coord.h"
#include "functions.h"
#include "effects.h"
extern void sub_08078954(Entity*);
@@ -129,13 +130,13 @@ void DirtBallProjectile_Action2(Entity* this) {
if (tmp != 0) {
switch (tmp) {
case 2:
CreateFx(this, 0xb, 0);
CreateFx(this, FX_WATER_SPLASH, 0);
break;
case 1:
CreateFx(this, 0, 0);
CreateFx(this, FX_FALL_DOWN, 0);
break;
case 3:
CreateFx(this, 0xc, 0);
CreateFx(this, FX_LAVA_SPLASH, 0);
break;
}
DeleteThisEntity();
@@ -148,7 +149,7 @@ void DirtBallProjectile_Action2(Entity* this) {
this->action = 3;
return;
case 2:
entity = CreateFx(this, 5, 0x80);
entity = CreateFx(this, FX_POT_SHATTER, 0x80);
if (entity != NULL) {
entity->parent = NULL;
}
src/projectile/gleerokProjectile.c
+2 -1
View File
@@ -5,6 +5,7 @@
#include "functions.h"
#include "random.h"
#include "audio.h"
#include "effects.h"
extern void sub_0806F5BC(Entity*, u32, u32);
extern u32 sub_080041DC(Entity*, u32, u32);
@@ -90,7 +91,7 @@ void GleerokProjectile_Action1(Entity* this) {
if (this->type == 3) {
if (sub_08003FC4(this, 0x1800) == 0) {
sub_08008790(this, 7);
CreateFx(this, 4, 0);
CreateFx(this, FX_ROCK, 0);
DeleteThisEntity();
}
} else {
src/projectile/lakituCloudProjectile.c
+3 -2
View File
@@ -2,6 +2,7 @@
#include "enemy.h"
#include "functions.h"
#include "player.h"
#include "effects.h"
extern void sub_0800449C(Entity*, u32);
extern void sub_08079D84(void);
@@ -26,7 +27,7 @@ void nullsub_539(Entity* this) {
void sub_080A9CF0(Entity* this) {
if (sub_0806F520() == 0) {
CreateFx(this, 2, 0);
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}
LakituCloudProjectile_SubActions[this->subAction](this);
@@ -46,7 +47,7 @@ void LakituCloudProjectile_SubAction2(Entity* this) {
sub_0800449C(&gPlayerEntity, 0x7a);
sub_08079D84();
}
CreateFx(this, 2, 0);
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}
}
src/projectile/lakituLightning.c
+2 -1
View File
@@ -1,5 +1,6 @@
#include "entity.h"
#include "enemy.h"
#include "effects.h"
extern s32 sub_080AF090(Entity*);
extern s32 sub_080A7EB0(Entity*);
@@ -35,7 +36,7 @@ void LakituLightning_Action1(Entity* this) {
GetNextFrame(this);
sub_080AF090(this);
if ((this->collisions != 0) || (--this->actionDelay == 0)) {
CreateFx(this, 0x4f, 0);
CreateFx(this, FX_BLUE_EFC, 0);
DeleteThisEntity();
}
if (sub_080A7EB0(this) != 0) {
src/projectile/octorokBossProjectile.c
+3 -2
View File
@@ -3,6 +3,7 @@
#include "random.h"
#include "functions.h"
#include "audio.h"
#include "effects.h"
void OctorokBossProjectile_Action2(Entity*);
extern void sub_080AE58C(Entity*, u32, u32);
@@ -183,14 +184,14 @@ void OctorokBossProjectile_Action1(Entity* this) {
if (sub_08003FC4(this, 0x1800) != 0) {
return;
}
CreateFx(this, 4, 0);
CreateFx(this, FX_ROCK, 0);
DeleteThisEntity();
break;
}
}
void OctorokBossProjectile_Action2(Entity* this) {
CreateFx(this, 4, 0);
CreateFx(this, FX_ROCK, 0);
DeleteThisEntity();
}
src/projectile/stalfosProjectile.c
+3 -2
View File
@@ -1,6 +1,7 @@
#include "entity.h"
#include "enemy.h"
#include "functions.h"
#include "effects.h"
extern void (*const StalfosProjectile_Functions[])(Entity*);
extern void (*const StalfosProjectile_Actions[])(Entity*);
@@ -126,9 +127,9 @@ void StalfosProjectile_Action3(Entity* this) {
void sub_080A9BA8(Entity* this) {
if (this->type == 0) {
CreateFx(this, 5, 0);
CreateFx(this, FX_POT_SHATTER, 0);
} else {
CreateFx(this, 0x3c, 0);
CreateFx(this, FX_BONE, 0);
}
DeleteThisEntity();
}
src/projectile/v2Projectile.c
+4 -3
View File
@@ -4,6 +4,7 @@
#include "functions.h"
#include "random.h"
#include "audio.h"
#include "effects.h"
extern void (*const V2Projectile_Functions[])(Entity*);
extern void (*const gUnk_0812A7EC[])(Entity*);
@@ -26,7 +27,7 @@ ASM_FUNC("asm/non_matching/v2Projectile/sub_080ABBF4.inc", void sub_080ABBF4(Ent
void sub_080ABC54(Entity* this) {
if (sub_0806F520() == 0) {
CreateFx(this, 2, 0);
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}
gUnk_0812A808[this->subAction](this);
@@ -44,7 +45,7 @@ void sub_080ABC90(Entity* this) {
ModHealth(-2);
sub_0800449C(&gPlayerEntity, 0x7a);
sub_08079D84();
CreateFx(this, 2, 0);
CreateFx(this, FX_DEATH, 0);
DeleteThisEntity();
}
}
@@ -96,7 +97,7 @@ ASM_FUNC("asm/non_matching/v2Projectile/sub_080ABE04.inc", void sub_080ABE04(Ent
void sub_080ABE88(Entity* this) {
if (sub_08003FC4(this, 0x1800) == 0) {
CreateFx(this, 4, 0);
CreateFx(this, FX_ROCK, 0);
DeleteThisEntity();
}
}
src/projectile/v3TennisBallProjectile.c
+2 -1
View File
@@ -2,6 +2,7 @@
#include "enemy.h"
#include "audio.h"
#include "functions.h"
#include "effects.h"
extern s32 sub_080AF090(Entity*);
extern s32 sub_080A7EB0(Entity*);
@@ -56,7 +57,7 @@ void sub_080ACB90(Entity* this) {
Entity* parent = this->parent;
if ((this->x.HALF.HI == parent->x.HALF.HI) && (this->y.HALF.HI <= parent->y.HALF.HI)) {
parent->field_0xf = 1;
CreateFx(this, 0x1f, 0x40);
CreateFx(this, FX_REFLECT2, 0x40);
EnqueueSFX(SFX_ITEM_GLOVES_KNOCKBACK);
DeleteThisEntity();
}