diff --git a/linker.ld b/linker.ld index c18e4e3a..e39f434f 100644 --- a/linker.ld +++ b/linker.ld @@ -634,7 +634,7 @@ SECTIONS { src/object/objectB.o(.text); src/object/chestSpawner.o(.text); src/object/objectD.o(.text); - asm/object/objectE.o(.text); + src/object/objectE.o(.text); src/object/specialFx.o(.text); asm/object/object10.o(.text); src/object/object11.o(.text); diff --git a/src/object/objectE.c b/src/object/objectE.c new file mode 100644 index 00000000..e7cee6bc --- /dev/null +++ b/src/object/objectE.c @@ -0,0 +1,26 @@ +/** + * @file objectE.c + * @ingroup Objects + * + * @brief ObjectE object + */ + +#define NENT_DEPRECATED +#include "global.h" +#include "object.h" +#include "functions.h" + +void ObjectE(Entity* this) { + if (this->action == 0) { + this->action = 1; + this->actionDelay = 0x14; + sub_08004168(this); + } else { + if (this->actionDelay-- == 0) { + sub_0807B7D8(0x35, COORD_TO_TILE(this), this->collisionLayer); + CreateFx(this, FX_FALL_DOWN, 0x40); + SoundReq(SFX_126); + DeleteThisEntity(); + } + } +}