summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
Diffstat (limited to 'src/object')
-rw-r--r--src/object/bigBarrel.c8
-rw-r--r--src/object/bigPushableLever.c2
-rw-r--r--src/object/bird.c2
-rw-r--r--src/object/chestSpawner.c4
-rw-r--r--src/object/chuchuBossStartParticle.c8
-rw-r--r--src/object/gleerokParticle.c4
-rw-r--r--src/object/graveyardKey.c2
-rw-r--r--src/object/gyorgBossObject.c4
-rw-r--r--src/object/itemForSale.c2
-rw-r--r--src/object/keyStealingTakkuri.c6
-rw-r--r--src/object/lightRay.c12
-rw-r--r--src/object/lilypadLarge.c2
-rw-r--r--src/object/litArea.c4
-rw-r--r--src/object/minishEmoticon.c2
-rw-r--r--src/object/object70.c5
-rw-r--r--src/object/objectBlockingStairs.c2
-rw-r--r--src/object/objectOnPillar.c2
-rw-r--r--src/object/octorokBossObject.c2
-rw-r--r--src/object/playerClone.c4
-rw-r--r--src/object/pullableMushroom.c8
-rw-r--r--src/object/pushableFurniture.c6
-rw-r--r--src/object/pushableLever.c2
-rw-r--r--src/object/pushableStatue.c2
-rw-r--r--src/object/stoneTablet.c7
-rw-r--r--src/object/vaati1Portal.c2
-rw-r--r--src/object/whirlwind.c8
26 files changed, 57 insertions, 55 deletions
diff --git a/src/object/bigBarrel.c b/src/object/bigBarrel.c
index 6b12f308..f40c90a3 100644
--- a/src/object/bigBarrel.c
+++ b/src/object/bigBarrel.c
@@ -109,7 +109,7 @@ void sub_08088BE0(BigBarrelEntity* this) {
Entity* ent;
if (CheckLocalFlag(0x15) == 0) {
- sub_08088C78(this, 2, 0, 0xffffff88);
+ sub_08088C78(this, 2, 0, -120);
ent = sub_08088C78(this, 4, 0x15, 0);
if (ent != NULL) {
ent->x.HALF.HI = gRoomControls.origin_x + 0x48;
@@ -118,15 +118,15 @@ void sub_08088BE0(BigBarrelEntity* this) {
}
if (CheckLocalFlag(0x16) == 0) {
- sub_08088C78(this, 2, 1, 0x78);
+ sub_08088C78(this, 2, 1, 120);
ent = sub_08088C78(this, 4, 0x16, 0);
if (ent != NULL) {
ent->x.HALF.HI = gRoomControls.origin_x + 0x188;
ent->y.HALF.HI = gRoomControls.origin_y + 200;
}
}
- sub_08088C78(this, 1, 0, 0xffffff88);
- sub_08088C78(this, 1, 1, 0x78);
+ sub_08088C78(this, 1, 0, -120);
+ sub_08088C78(this, 1, 1, 120);
}
Entity* sub_08088C78(BigBarrelEntity* this, u32 type, u32 type2, u32 xOffset) {
diff --git a/src/object/bigPushableLever.c b/src/object/bigPushableLever.c
index 8f5a3808..1f62e640 100644
--- a/src/object/bigPushableLever.c
+++ b/src/object/bigPushableLever.c
@@ -59,7 +59,7 @@ void BigPushableLever_Idle(BigPushableLeverEntity* this) {
RequestPriorityDuration(super, 30);
if (PlayerCanBeMoved()) {
gPlayerState.pushedObject = 0x98;
- gPlayerState.queued_action = 5;
+ gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= PL_BUSY;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
diff --git a/src/object/bird.c b/src/object/bird.c
index 480cc984..55f080ad 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -225,7 +225,7 @@ void Bird_Type8(Entity* this) {
PlayerCanBeMoved() && (EntityInRectRadius(this, &gPlayerEntity, 0xe, 0xe))) {
s32 z = gPlayerEntity.z.HALF.HI - this->z.HALF.HI - 8;
if ((u16)z < 0x20 && gPlayerEntity.health != 0) {
- pEVar5 = CreateObject(0x95, 10, 0);
+ pEVar5 = CreateObject(BIRD, 10, 0);
if (pEVar5 != NULL) {
this->child = pEVar5;
this->action = 2;
diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c
index 731e8042..dfe03a92 100644
--- a/src/object/chestSpawner.c
+++ b/src/object/chestSpawner.c
@@ -123,7 +123,7 @@ void ChestSpawner_Type2Action2(ChestSpawnerEntity* this) {
super->subAction = 1;
break;
case 1:
- if ((super->type == 5) || (gPlayerEntity.action == 1)) {
+ if ((super->type == 5) || (gPlayerEntity.action == PLAYER_NORMAL)) {
super->subAction = 2;
super->timer = 8;
super->subtimer = 0;
@@ -201,7 +201,7 @@ void sub_080840A8(s32 param_1, s32 param_2) {
obj->zVelocity = gUnk_0811F840[Random() & 3];
obj->x.HALF.HI = gUnk_0811F850[Random() & 3] + param_1;
obj->y.HALF.HI = param_2 + 1;
- obj->z.HALF.HI = 0xfff8;
+ obj->z.HALF.HI = -8;
ResolveCollisionLayer(obj);
obj = CreateFx(obj, FX_DASH, 0);
if (obj != NULL) {
diff --git a/src/object/chuchuBossStartParticle.c b/src/object/chuchuBossStartParticle.c
index 370b8d4b..ae8dfd15 100644
--- a/src/object/chuchuBossStartParticle.c
+++ b/src/object/chuchuBossStartParticle.c
@@ -221,7 +221,7 @@ void sub_0808F3DC(Entity* this) {
}
if (this->type == 5 && (this->frame & 1)) {
- Entity* entity = CreateObjectWithParent(this->child, 0x49, 8, 0);
+ Entity* entity = CreateObjectWithParent(this->child, CHUCHU_BOSS_START_PARTICLE, 8, 0);
if (entity != NULL) {
entity->parent = this->parent;
entity->child = this->parent->parent;
@@ -288,19 +288,19 @@ void sub_0808F554(Entity* this) {
}
void sub_0808F5EC(Entity* this) {
- Entity* entity = CreateObjectWithParent(this->child, 0x49, 5, 0);
+ Entity* entity = CreateObjectWithParent(this->child, CHUCHU_BOSS_START_PARTICLE, 5, 0);
if (entity != NULL) {
entity->parent = this;
entity->child = this->child;
}
- entity = CreateObjectWithParent(this->child, 0x49, 6, 0);
+ entity = CreateObjectWithParent(this->child, CHUCHU_BOSS_START_PARTICLE, 6, 0);
if (entity != NULL) {
entity->parent = this;
entity->child = this->child;
}
- entity = CreateObjectWithParent(this->child, 0x49, 7, 0);
+ entity = CreateObjectWithParent(this->child, CHUCHU_BOSS_START_PARTICLE, 7, 0);
if (entity != NULL) {
entity->parent = this;
entity->child = this->child;
diff --git a/src/object/gleerokParticle.c b/src/object/gleerokParticle.c
index 93462377..e878f2a1 100644
--- a/src/object/gleerokParticle.c
+++ b/src/object/gleerokParticle.c
@@ -323,11 +323,11 @@ void sub_08094660(GleerokParticleEntity* this) {
sub_08094708(this, iVar3, iVar4);
iVar3 = super->x.HALF.HI + spriteOffsetX + 0x30;
iVar4 = super->y.HALF.HI + spriteOffsetX + 0x30;
- this->unk78 = 0xfffffff0;
+ this->unk78 = -16;
this->unk7c = 0;
sub_08094708(this, iVar3, iVar4);
this->unk78 = 0;
- this->unk7c = 0xfffffff0;
+ this->unk7c = -16;
sub_08094708(this, iVar3, iVar4);
}
}
diff --git a/src/object/graveyardKey.c b/src/object/graveyardKey.c
index 0a0dfc0b..e4c4f2ef 100644
--- a/src/object/graveyardKey.c
+++ b/src/object/graveyardKey.c
@@ -173,7 +173,7 @@ void sub_0809D91C(Entity* this) {
bool32 sub_0809D93C(Entity* this, const struct_gUnk_08123FB0* param_2) {
u32 uVar1;
- if (gPlayerEntity.action == 6 && ((param_2->unk0c >> gPlayerEntity.animationState & 1) != 0)) {
+ if (gPlayerEntity.action == PLAYER_BOUNCE && ((param_2->unk0c >> gPlayerEntity.animationState & 1) != 0)) {
uVar1 = (gPlayerEntity.x.HALF.HI - this->x.HALF.HI) + param_2->unk08 + param_2->unk0a;
if (param_2->unk0a * 2 <= (u16)uVar1) {
return 0;
diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c
index f66fdee7..d9f44c6d 100644
--- a/src/object/gyorgBossObject.c
+++ b/src/object/gyorgBossObject.c
@@ -421,12 +421,12 @@ void GyorgBossObject_SpawnChildren(u32 unk0, bool32 fromBlue, u32 animationState
tmp->attackOffsetY = -p->offsetY;
break;
case 1:
- tmp->attackOffsetX = p->offsetY + 0xF0;
+ tmp->attackOffsetX = p->offsetY + DISPLAY_WIDTH;
tmp->attackOffsetY = p->offsetX;
break;
case 2:
tmp->attackOffsetX = p->offsetX;
- tmp->attackOffsetY = p->offsetY + 0xA0;
+ tmp->attackOffsetY = p->offsetY + DISPLAY_HEIGHT;
break;
case 3:
tmp->attackOffsetX = -p->offsetY;
diff --git a/src/object/itemForSale.c b/src/object/itemForSale.c
index 20664a1c..283969f8 100644
--- a/src/object/itemForSale.c
+++ b/src/object/itemForSale.c
@@ -92,7 +92,7 @@ void ItemForSale_Action1(ItemForSaleEntity* this) {
super->interactType = 0;
super->action = 3;
gRoomVars.animFlags = 1;
- gPlayerState.queued_action = 7;
+ gPlayerState.queued_action = PLAYER_08070E9C;
}
} else {
if (super->interactType != 0) {
diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c
index bc4c4dd5..1cc970ca 100644
--- a/src/object/keyStealingTakkuri.c
+++ b/src/object/keyStealingTakkuri.c
@@ -378,7 +378,7 @@ void KeyStealingTakkuri_Type4_Init(KeyStealingTakkuriEntity* this) {
super->action++;
super->collisionLayer = 1;
super->spriteRendering.b3 = 1;
- super->z.HALF.HI = 0xfff0;
+ super->z.HALF.HI = -16;
sub_0807DD64(super);
InitAnimationForceUpdate(super, 1);
}
@@ -396,7 +396,7 @@ void sub_0809E0A0(KeyStealingTakkuriEntity* this) {
super->child = obj;
super->subtimer = 0;
CopyPosition(&gPlayerEntity, obj);
- obj->z.HALF.HI = 0xfff8;
+ obj->z.HALF.HI = -8;
}
}
@@ -518,7 +518,7 @@ u32 sub_0809E2C4(KeyStealingTakkuriEntity* this, u32 param_2) {
uVar1 = roomY - tmp->unk_2 + tmp->unk_5;
uVar2 = tmp->unk_5 * 2;
if (uVar2 > (u16)uVar1) {
- if (tmp->unk_6 == gPlayerEntity.animationState && gPlayerEntity.action == 6) {
+ if (tmp->unk_6 == gPlayerEntity.animationState && gPlayerEntity.action == PLAYER_BOUNCE) {
return 1;
}
return 2;
diff --git a/src/object/lightRay.c b/src/object/lightRay.c
index 4aae9aac..c353a862 100644
--- a/src/object/lightRay.c
+++ b/src/object/lightRay.c
@@ -94,14 +94,14 @@ void sub_0809B97C(LightRayEntity* this, u32 param_2) {
if (tmp1 < 0) {
tmp1 = 0;
}
- if (0xf0 < tmp1) {
- tmp1 = 0xf0;
+ if (DISPLAY_WIDTH < tmp1) {
+ tmp1 = DISPLAY_WIDTH;
}
if (tmp2 < 0) {
tmp2 = 0;
}
- if (0xf0 < tmp2) {
- tmp2 = 0xf0;
+ if (DISPLAY_WIDTH < tmp2) {
+ tmp2 = DISPLAY_WIDTH;
}
gScreen.controls.window0HorizontalDimensions = (tmp1 << 8) | tmp2;
}
@@ -124,8 +124,8 @@ void LightRay_Type1(LightRayEntity* this) {
}
gPlayerEntity.animationState = tmp;
gScreen.lcd.displayControl = (gScreen.lcd.displayControl & 0xbfff) | 0x2000;
- gScreen.controls.window0HorizontalDimensions = 0xf0;
- gScreen.controls.window0VerticalDimensions = 0xa0;
+ gScreen.controls.window0HorizontalDimensions = DISPLAY_WIDTH;
+ gScreen.controls.window0VerticalDimensions = DISPLAY_HEIGHT;
break;
case 1:
if (super->timer != 0) {
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index 570ffb09..71a1f443 100644
--- a/src/object/lilypadLarge.c
+++ b/src/object/lilypadLarge.c
@@ -347,7 +347,7 @@ void sub_08085A44(LilypadLargeEntity* this) {
if (GetRelativeCollisionTile(super, 0x10, 0x18) != 0x11) {
super->direction = 0x18;
} else {
- if (GetRelativeCollisionTile(super, 0xfffffff0, 0x18) != 0x11) {
+ if (GetRelativeCollisionTile(super, -0x10, 0x18) != 0x11) {
super->direction = 8;
} else {
super->direction = 0x10;
diff --git a/src/object/litArea.c b/src/object/litArea.c
index 74c14e5b..b615672c 100644
--- a/src/object/litArea.c
+++ b/src/object/litArea.c
@@ -23,7 +23,7 @@ void LitArea(Entity* this) {
this->flags |= ENT_PERSIST;
this->subtimer = gRoomControls.room;
this->timer = 2;
- this->field_0x68.HWORD = 0xfffe;
+ this->field_0x68.HWORD = -2;
this->field_0x6a.HWORD = 0x80;
SetAffineInfo(this, 0x80, 0x80, 0);
} else {
@@ -34,7 +34,7 @@ void LitArea(Entity* this) {
this->field_0x68.HWORD = 1;
}
if (0x88 < this->field_0x6a.HWORD) {
- this->field_0x68.HWORD = 0xffff;
+ this->field_0x68.HWORD = -1;
}
SetAffineInfo(this, this->field_0x6a.HWORD, this->field_0x6a.HWORD, 0);
}
diff --git a/src/object/minishEmoticon.c b/src/object/minishEmoticon.c
index a42a9ac8..0904b1cb 100644
--- a/src/object/minishEmoticon.c
+++ b/src/object/minishEmoticon.c
@@ -72,7 +72,7 @@ void MinishEmoticon_Action1(Entity* this) {
animIndex = origAnimIndex + 0x19;
}
} else {
- if ((gPlayerState.framestate == 1) || (gPlayerState.framestate == 25)) {
+ if (gPlayerState.framestate == PL_STATE_WALK || gPlayerState.framestate == PL_STATE_PUSH) {
animIndex = origAnimIndex + 4;
if (this->animIndex != animIndex) {
this->z.WORD = 0;
diff --git a/src/object/object70.c b/src/object/object70.c
index 7cc2664f..064f6808 100644
--- a/src/object/object70.c
+++ b/src/object/object70.c
@@ -42,7 +42,8 @@ void Object70_Action1(Entity* this) {
if (this->type == 0) {
if (gPlayerEntity.z.WORD == 0) {
if ((((gPlayerState.dash_state & 0x40) == 0) && (gPlayerState.floor_type == SURFACE_SWAMP)) &&
- ((gPlayerEntity.action == 1 || ((gPlayerEntity.action == 0x18 || (gPlayerEntity.action == 4)))))) {
+ ((gPlayerEntity.action == PLAYER_NORMAL ||
+ ((gPlayerEntity.action == PLAYER_ROLL || (gPlayerEntity.action == PLAYER_JUMP)))))) {
goto _080974FA;
} else {
if (gPlayerEntity.z.WORD == 0) {
@@ -65,7 +66,7 @@ void Object70_Action1(Entity* this) {
}
} else {
- if (gPlayerEntity.action != 0x1e) {
+ if (gPlayerEntity.action != PLAYER_USEENTRANCE) {
if (this->collisionLayer == 1) {
gPlayerEntity.spriteOrientation.flipY = 2;
} else {
diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c
index 8664a365..5473531d 100644
--- a/src/object/objectBlockingStairs.c
+++ b/src/object/objectBlockingStairs.c
@@ -162,7 +162,7 @@ void ObjectBlockingStairs_Action2(ObjectBlockingStairsEntity* this) {
} else {
if (gPlayerState.heldObject == 0x12) {
if ((gPlayerEntity.frame & 2) != 0 && ++super->subtimer > 8) {
- gPlayerState.queued_action = 16;
+ gPlayerState.queued_action = PLAYER_PULL;
gPlayerState.field_0x38 = 0x40;
gPlayerState.flags |= PL_BUSY;
gPlayerEntity.x.HALF.LO = 0;
diff --git a/src/object/objectOnPillar.c b/src/object/objectOnPillar.c
index 1b82f909..371d8ec2 100644
--- a/src/object/objectOnPillar.c
+++ b/src/object/objectOnPillar.c
@@ -129,7 +129,7 @@ void ObjectOnPillar_SubAction0(ObjectOnPillarEntity* this) {
}
sub_08097008(this);
if (sub_080896B0()) {
- gPlayerState.queued_action = 0x10;
+ gPlayerState.queued_action = PLAYER_PULL;
gPlayerState.field_0x38 = 0x20;
gPlayerState.flags |= PL_BUSY;
gPlayerEntity.x.HALF.LO = 0;
diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c
index a1f974de..ad3afd84 100644
--- a/src/object/octorokBossObject.c
+++ b/src/object/octorokBossObject.c
@@ -79,7 +79,7 @@ void OctorokBossObject_Init(Entity* this) {
}
}
- this->speed = 0xf0 - (Random() & 0x3f);
+ this->speed = DISPLAY_WIDTH - (Random() & 0x3f);
LinearMoveAngle(this, ((s16)this->speed >> 1) << 8, (u32)this->direction);
LinearMoveAngle(this, ((s16)this->speed >> 1) << 8, (u32)this->direction);
InitializeAnimation(this, 5);
diff --git a/src/object/playerClone.c b/src/object/playerClone.c
index 485975d9..3dd8b990 100644
--- a/src/object/playerClone.c
+++ b/src/object/playerClone.c
@@ -105,8 +105,8 @@ void PlayerClone_Action2(PlayerCloneEntity* this) {
super->subtimer--;
}
- if (gPlayerState.chargeState.action == 5 && gPlayerClones[super->type] != NULL && gPlayerState.framestate != 19 &&
- super->health != 0) {
+ if (gPlayerState.chargeState.action == 5 && gPlayerClones[super->type] != NULL &&
+ gPlayerState.framestate != PL_STATE_TALKEZLO && super->health != 0) {
if (gPlayerEntity.iframes >= 1) {
gPlayerState.chargeState.action = 1;
} else {
diff --git a/src/object/pullableMushroom.c b/src/object/pullableMushroom.c
index 408cff7d..c03f3444 100644
--- a/src/object/pullableMushroom.c
+++ b/src/object/pullableMushroom.c
@@ -234,8 +234,8 @@ void sub_0808AEB0(PullableMushroomEntity* this) {
super->subtimer = 1;
} else {
- if (((super->subtimer != 0) && (gPlayerEntity.action == 1)) && (gPlayerState.swim_state == 0)) {
- gPlayerState.queued_action = 0x1b;
+ if (((super->subtimer != 0) && (gPlayerEntity.action == PLAYER_NORMAL)) && (gPlayerState.swim_state == 0)) {
+ gPlayerState.queued_action = PLAYER_08072C9C;
gPlayerState.field_0x38 = uVar1;
gPlayerState.field_0x39 = super->direction ^ 0x10;
gPlayerState.field_0x3a = sub_0808B1F0(this, &gPlayerEntity);
@@ -315,9 +315,9 @@ void sub_0808B0BC(PullableMushroomEntity* this) {
ent.base.x.HALF.HI = ptr[0] + gPlayerEntity.x.HALF.HI;
ent.base.y.HALF.HI = ptr[1] + gPlayerEntity.y.HALF.HI;
if (sub_0800419C(&ent.base, super, 7, 7)) {
- if ((gPlayerEntity.action != 1) || (gPlayerState.swim_state != 0))
+ if ((gPlayerEntity.action != PLAYER_NORMAL) || (gPlayerState.swim_state != 0))
return;
- gPlayerState.queued_action = 0x1b;
+ gPlayerState.queued_action = PLAYER_08072C9C;
gPlayerState.field_0x38 = uVar2;
gPlayerState.field_0x39 = super->direction ^ 0x10;
gPlayerState.field_0x3a = sub_0808B1F0((PullableMushroomEntity*)super->parent, &gPlayerEntity);
diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c
index ff6b627c..37aff557 100644
--- a/src/object/pushableFurniture.c
+++ b/src/object/pushableFurniture.c
@@ -342,9 +342,9 @@ void sub_0808FDE8(PushableFurnitureEntity* this) {
bool32 sub_0808FECC(PushableFurnitureEntity* this) {
bool32 result = TRUE;
- if (!((gPlayerState.flags & PL_MINISH) == 0 && (gPlayerEntity.action == 6) && (gPlayerEntity.animationState == 0) &&
- (gPlayerEntity.y.HALF.HI - super->y.HALF.HI < 0x14) && (super->x.HALF.HI + 0xc > gPlayerEntity.x.HALF.HI) &&
- (super->x.HALF.HI - 12 < gPlayerEntity.x.HALF.HI))) {
+ if (!((gPlayerState.flags & PL_MINISH) == 0 && (gPlayerEntity.action == PLAYER_BOUNCE) &&
+ (gPlayerEntity.animationState == 0) && (gPlayerEntity.y.HALF.HI - super->y.HALF.HI < 0x14) &&
+ (super->x.HALF.HI + 0xc > gPlayerEntity.x.HALF.HI) && (super->x.HALF.HI - 12 < gPlayerEntity.x.HALF.HI))) {
result = FALSE;
}
return result;
diff --git a/src/object/pushableLever.c b/src/object/pushableLever.c
index 3c8ee887..dec3fcb7 100644
--- a/src/object/pushableLever.c
+++ b/src/object/pushableLever.c
@@ -58,7 +58,7 @@ void PushableLever_Idle(PushableLeverEntity* this) {
RequestPriorityDuration(super, 30);
if (PlayerCanBeMoved()) {
gPlayerState.pushedObject = 0x90;
- gPlayerState.queued_action = 5;
+ gPlayerState.queued_action = PLAYER_PUSH;
gPlayerState.flags |= PL_BUSY;
gPlayerEntity.x.HALF.LO = 0;
gPlayerEntity.y.HALF.LO = 0;
diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c
index 099d96e5..d24e44c7 100644
--- a/src/object/pushableStatue.c
+++ b/src/object/pushableStatue.c
@@ -130,7 +130,7 @@ void PushableStatue_SubAction0(PushableStatueEntity* this) {
}
}
if (sub_080896B0()) {
- gPlayerState.queued_action = 0x10;
+ gPlayerState.queued_action = PLAYER_PULL;
gPlayerState.field_0x38 = 0x20;
gPlayerState.flags |= 1;
gPlayerEntity.x.HALF.LO = 0;
diff --git a/src/object/stoneTablet.c b/src/object/stoneTablet.c
index ad01fcda..06049ca9 100644
--- a/src/object/stoneTablet.c
+++ b/src/object/stoneTablet.c
@@ -22,9 +22,10 @@ void StoneTablet(Entity* this) {
void StoneTablet_Init(Entity* this) {
// TODO recreate as TileData[]
- static const u16 gUnk_081232EC[] = { 0x4022, 0xfffe, 0x4022, 0xffff, 0x4022, 0x0, 0x4022, 0x1, 0xffff };
- static const u16 gUnk_081232FE[] = { 0x4065, 0xffbf, 0x4022, 0xffc0, 0x4066, 0xffc1, 0x4029,
- 0xffff, 0x4026, 0x0, 0x402a, 0x1, 0xffff };
+ static const u16 gUnk_081232EC[] = { 0x4022, -2, 0x4022, -1, 0x4022, 0, 0x4022, 1, 0xffff };
+ static const u16 gUnk_081232FE[] = {
+ 0x4065, -65, 0x4022, -64, 0x4066, -63, 0x4029, -1, 0x4026, 0, 0x402a, 1, 0xffff
+ };
this->action = 1;
this->spriteSettings.draw = 1;
if (this->type == 3) {
diff --git a/src/object/vaati1Portal.c b/src/object/vaati1Portal.c
index dd60a587..dfbc8487 100644
--- a/src/object/vaati1Portal.c
+++ b/src/object/vaati1Portal.c
@@ -59,7 +59,7 @@ void Vaati1Portal_Action2(Entity* this) {
void sub_080A0190(Entity* this) {
this->subAction = 1;
CopyPosition(this, &gPlayerEntity);
- gPlayerState.queued_action = 3;
+ gPlayerState.queued_action = PLAYER_FALL;
gPlayerState.field_0x38 = 0;
gPlayerState.flags |= PL_PIT_IS_EXIT;
}
diff --git a/src/object/whirlwind.c b/src/object/whirlwind.c
index 8dbd8959..b7933500 100644
--- a/src/object/whirlwind.c
+++ b/src/object/whirlwind.c
@@ -62,9 +62,9 @@ void Whirlwind_Action1(Entity* this) {
if (this->spriteSettings.draw != 0) {
GetNextFrame(this);
if ((((((gPlayerState.flags & PL_MINISH) == 0)) && (gPlayerState.field_0x3c == 0)) &&
- ((gPlayerEntity.action == 4 || ((gPlayerEntity.flags & ENT_COLLIDE) != 0)))) &&
- ((gPlayerEntity.action != 6 && (sub_0800419C(this, &gPlayerEntity, 0xc, 0xc) != 0)))) {
- if (((gPlayerState.flags & PL_PARACHUTE) == 0) && (gPlayerEntity.action != 4)) {
+ ((gPlayerEntity.action == PLAYER_JUMP || ((gPlayerEntity.flags & ENT_COLLIDE) != 0)))) &&
+ ((gPlayerEntity.action != PLAYER_BOUNCE && (sub_0800419C(this, &gPlayerEntity, 0xc, 0xc) != 0)))) {
+ if (((gPlayerState.flags & PL_PARACHUTE) == 0) && (gPlayerEntity.action != PLAYER_JUMP)) {
if ((this->type2 != 1) && (-0x10 < gPlayerEntity.z.HALF.HI)) {
return;
}
@@ -76,7 +76,7 @@ void Whirlwind_Action1(Entity* this) {
sub_08004542(&gPlayerEntity);
gPlayerEntity.collisionLayer = 1;
gPlayerEntity.flags |= ENT_COLLIDE;
- gPlayerState.queued_action = 0x1f;
+ gPlayerState.queued_action = PLAYER_PARACHUTE;
gPlayerState.field_0x38 = this->type2;
gPlayerState.field_0x39 = 0xff;
this->spritePriority.b0 = gPlayerEntity.spritePriority.b0 - 1;
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-21 13:30:53 +0000