summaryrefslogtreecommitdiff
path: root/src/createObject.c
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2021-10-26 20:33:33 -0700
committertheo3 <arisstephenson2@gmail.com>2021-10-26 20:33:33 -0700
commitd29468c30bcf5d786e4d97446d8d3512063c71bc (patch)
treec2b34a84ba0a7e9ccbabf03eaf66092d8695b604 /src/createObject.c
parent3f5449c1a1aed612e5b2c1190699bafef2603241 (diff)
add effects.h
Diffstat (limited to 'src/createObject.c')
-rw-r--r--src/createObject.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/createObject.c b/src/createObject.c
index cf3655c9..0d18f6b1 100644
--- a/src/createObject.c
+++ b/src/createObject.c
@@ -4,6 +4,7 @@
#include "room.h"
#include "createObject.h"
#include "object.h"
+#include "effects.h"
Entity* CreateObject(u32 subtype, u32 form, u32 parameter) {
Entity* entity;
@@ -36,13 +37,13 @@ Entity* CreateFx(Entity* parentEnt, u32 form, u32 parameter) {
}
void CreateDust(Entity* parent) {
- CreateFx(parent, 2, 0);
+ CreateFx(parent, FX_DEATH, 0);
}
void CreateDustAt(s32 xOff, s32 yOff, u32 layer) {
Entity* ent;
- ent = CreateObject(SPECIAL_FX, 2, 0);
+ ent = CreateObject(SPECIAL_FX, FX_DEATH, 0);
if (ent != NULL) {
ent->x.HALF.HI = gRoomControls.roomOriginX + xOff;
ent->y.HALF.HI = gRoomControls.roomOriginY + yOff;
@@ -51,15 +52,15 @@ void CreateDustAt(s32 xOff, s32 yOff, u32 layer) {
}
void CreateDustSmall(Entity* parent) {
- CreateFx(parent, 0x11, 0);
+ CreateFx(parent, FX_DASH, 0);
}
void CreateExplosionBroken(Entity* parent) {
- CreateFx(parent, 0x6, 0);
+ CreateFx(parent, FX_6, 0);
}
void CreateWaterSplash(Entity* parent) {
- CreateFx(parent, 0xb, 0);
+ CreateFx(parent, FX_WATER_SPLASH, 0);
}
Entity* sub_080A2A20(Entity* parent, u32 form, u32 parameter) {
@@ -86,7 +87,7 @@ Entity* sub_080A2A3C(Entity* parent, u32 form, u32 subtype, u32 param_4) {
Entity* CreateWaterTrace(Entity* parent) {
Entity* ent;
- ent = CreateFx(parent, 0x20, 0);
+ ent = CreateFx(parent, FX_RIPPLE, 0);
if (ent != NULL) {
ent->spritePriority.b0 = 7;
}