summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/coord.c3
-rw-r--r--src/item/itemGustJar.c5
-rw-r--r--src/object/evilSpirit.c214
3 files changed, 3 insertions, 219 deletions
diff --git a/src/coord.c b/src/coord.c
index 9a6a6ce5..0bce952b 100644
--- a/src/coord.c
+++ b/src/coord.c
@@ -7,7 +7,6 @@
#include "room.h"
#include "functions.h"
#include "color.h"
-#include "playeritem.h"
const u8 gSpriteSortAboveTable[];
const u8 gSpriteSortBelowTable[];
@@ -89,7 +88,7 @@ u32 sub_0806F3E4(Entity* ent) {
ent->subAction = 3;
(Entity*)gPlayerEntity.field_0x70.WORD = ent;
gPlayerState.field_0x1c = 7;
- item = CreatePlayerItem(PLAYER_ITEM_11, 0, 0, 0);
+ item = CreatePlayerItem(0x11, 0, 0, 0);
if (item != NULL) {
item->child = ent;
ent->parent = item;
diff --git a/src/item/itemGustJar.c b/src/item/itemGustJar.c
index eb70ffe3..60d9bb89 100644
--- a/src/item/itemGustJar.c
+++ b/src/item/itemGustJar.c
@@ -2,7 +2,6 @@
#include "entity.h"
#include "item.h"
#include "functions.h"
-#include "playeritem.h"
void (*const ItemGustJar_StateFunctions[])(ItemBehavior* beh, u32);
extern u32 sub_0807A894(Entity*);
@@ -103,7 +102,7 @@ void sub_08076F64(ItemBehavior* this, u32 arg1) {
gPlayerState.field_0xa &= ~(8 >> arg1);
this->stateID = 2;
sub_08077DF4(this, 0x504);
- item = CreatePlayerItem(PLAYER_ITEM_10, 0, 0, 0);
+ item = CreatePlayerItem(0x10, 0, 0, 0);
if (item) {
item->parent = player;
}
@@ -141,7 +140,7 @@ void sub_08076F64(ItemBehavior* this, u32 arg1) {
gPlayerState.field_0x1c = 5;
gPlayerEntity.field_0x70.WORD = 0;
if (gPlayerState.field_0x1d) {
- CreatePlayerItem(PLAYER_ITEM_11, 0, 0, 0);
+ CreatePlayerItem(0x11, 0, 0, 0);
}
}
diff --git a/src/object/evilSpirit.c b/src/object/evilSpirit.c
deleted file mode 100644
index 39fa5cd9..00000000
--- a/src/object/evilSpirit.c
+++ /dev/null
@@ -1,214 +0,0 @@
-#define NENT_DEPRECATED
-#include "entity.h"
-#include "functions.h"
-#include "flags.h"
-#include "object.h"
-
-typedef struct {
- Entity base;
- u8 filler[0xe];
- u16 unk76;
- u16 unk78;
- u16 unk7a;
- u16 unk7c;
- u8 filler2;
- u8 unk7f;
- s32 x;
- s32 y;
-} EvilSpiritEntity;
-
-void EvilSpirit_Init(EvilSpiritEntity*);
-void EvilSpirit_Action1(EvilSpiritEntity*);
-void EvilSpirit_Action2(EvilSpiritEntity*);
-void EvilSpirit_Action3(EvilSpiritEntity*);
-
-void EvilSpirit(Entity* this) {
- static void (*const EvilSpirit_Actions[])(EvilSpiritEntity*) = {
- EvilSpirit_Init,
- EvilSpirit_Action1,
- EvilSpirit_Action2,
- EvilSpirit_Action3,
- };
- EvilSpirit_Actions[this->action]((EvilSpiritEntity*)this);
- this->bitfield = 0;
- sub_0805EC9C(this, ((EvilSpiritEntity*)this)->unk76, ((EvilSpiritEntity*)this)->unk7a, 0);
-}
-
-void EvilSpirit_Init(EvilSpiritEntity* this) {
- static const u16 gUnk_08120678[] = { 0x100, 0x110, 0x150, 0x1c0, 0x200 };
- u32 uVar1;
- Entity* evilSpiritEnt;
- u32 index;
-
- if (CheckLocalFlag(SORA_ELDER_RECOVER)) {
- DeleteThisEntity();
- }
- super->action = 1;
- uVar1 = gUnk_08120678[super->type];
- this->unk7c = uVar1;
- this->unk76 = uVar1;
- this->unk7a = this->unk7c;
- if (super->type == 0) {
- this->x = super->x.WORD;
- this->y = super->y.WORD;
- super->spriteRendering.b3 = 0;
- super->parent = super;
- COLLISION_ON(super);
- super->field_0x3c = 7;
- super->hitType = 1;
- super->flags2 = 4;
- for (index = 0; index < 4; index++) {
- evilSpiritEnt = CreateObjectWithParent(super, EVIL_SPIRIT, index + 1, 0);
- super->child = evilSpiritEnt;
- if (evilSpiritEnt != NULL) {
- evilSpiritEnt->parent = super->parent;
- super->child->child = super;
- super->parent = super->child;
- }
- }
- } else {
- super->spriteRendering.b3 = 1;
- }
- InitializeAnimation(super, super->type);
- EvilSpirit_Action1(this);
-}
-
-void EvilSpirit_Action1(EvilSpiritEntity* this) {
- s32 sVar3;
- u32 dir;
- s16 iVar5;
-
- if (super->type != 0) {
- if (((EvilSpiritEntity*)super->child)->unk7f == 0) {
- this->unk76 = this->unk7c;
- this->unk7a = this->unk7c;
- super->speed = 0x300;
- super->direction =
- sub_080045DA(super->parent->x.WORD - super->x.WORD, super->parent->y.WORD - super->y.WORD) ^ 0x80;
- } else {
- super->speed = 0x600;
- dir = sub_080045DA(gPlayerEntity.x.WORD - super->x.WORD, gPlayerEntity.y.WORD - super->y.WORD) ^ 0x80;
- if (dir != super->direction) {
- if ((u8)(dir - super->direction) > 0x80) {
- super->direction += 3;
- } else {
- super->direction -= 3;
- }
- }
- if ((gPlayerEntity.animationState & 2) == 0) {
- this->unk76 = this->unk7c + 0x40;
- } else {
- this->unk76 = this->unk7c - 0x20;
- this->unk7a = this->unk7c + 0x50;
- ;
- }
- }
- super->x = super->parent->x;
- super->y = super->parent->y;
- LinearMoveAngle(super, (int)super->speed, super->direction);
- return;
- }
-
- if ((super->bitfield & 0x7f) == 0x13) {
- super->direction++;
- super->field_0x1d--;
- this->unk7f = 1;
- if ((gPlayerEntity.animationState & 2) == 0) {
- this->unk76 = this->unk7c + 0x10;
- } else {
- this->unk76 = this->unk7c - 0x20;
- this->unk7a = this->unk7c + 0x30;
- }
- } else {
- super->direction = super->direction + 2;
- super->field_0x1d = 0xf0;
- this->unk7f = 0;
- this->unk76 = this->unk7c;
- this->unk7a = this->unk7c;
- }
-
- if (super->field_0x1d == 0) {
- super->action = 2;
- this->unk7f = 0;
- return;
- }
-
- if ((super->direction + 0x40) * 0x1000000 >= 0) {
- sVar3 = this->unk76;
- if ((short)this->unk76 >= 1) {
- this->unk76 = -sVar3;
- }
- } else {
- sVar3 = this->unk76;
- if (-1 >= (short)this->unk76) {
- this->unk76 = -sVar3;
- }
- }
-
- sVar3 = FixedMul(gSineTable[super->direction], 0x2000);
- iVar5 = FixedDiv(sVar3, 0x100);
- super->x.WORD = this->x + (iVar5 << 8);
- sVar3 = FixedMul(gSineTable[super->direction + 0x40], 0x1000);
- iVar5 = FixedDiv(sVar3, 0x100);
- super->y.WORD = this->y - (iVar5 << 8);
-}
-
-void EvilSpirit_Action2(EvilSpiritEntity* this) {
- u32 index;
-
- if ((super->bitfield & 0x7f) != 0x13) {
- super->action = 3;
- } else {
- if (sub_0806F3E4(super)) {
- SetLocalFlag(SORA_ELDER_RECOVER);
- SetRoomFlag(0);
-
- for (index = 0; index < 4; index++) {
- Entity* ent = super->child;
- super->child = ent->parent;
- DeleteEntity(ent);
- }
- DeleteThisEntity();
- }
- }
-}
-
-void EvilSpirit_Action3(EvilSpiritEntity* this) {
- short sVar2;
- short iVar4;
- int iVar6;
-
- super->direction = sub_080045DA(this->x - super->x.WORD, this->y - super->y.WORD);
- if ((super->bitfield & 0x7f) == 0x13) {
- super->speed = 0x100;
- super->field_0x1d--;
- this->unk7f = 1;
-
- if ((gPlayerEntity.animationState & 2) == 0) {
- this->unk76 = this->unk7c + 0x10;
- } else {
- this->unk76 = this->unk7c - 0x20;
- this->unk7a = this->unk7c + 0x30;
- }
- } else {
- super->speed = 0x200;
- super->field_0x1d = 0xf0;
- this->unk7f = 0;
- this->unk76 = this->unk7c;
- this->unk7a = this->unk7c;
- }
-
- if (super->field_0x1d == 0) {
- super->action = 2;
- this->unk7f = 0;
- } else {
- LinearMoveAngle(super, super->speed, super->direction);
- super->direction ^= 0x80;
- sVar2 = FixedMul(gSineTable[super->direction], 0x2000);
- iVar6 = this->x + (FixedDiv(sVar2, 0x100) << 8);
- sVar2 = FixedMul(gSineTable[super->direction + 0x40], 0x1000);
- if (EntityWithinDistance(super, iVar6, this->y - (FixedDiv(sVar2, 0x100) << 8), 2)) {
- super->action = 1;
- }
- }
-}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-02 17:05:05 +0000