diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-07-23 12:43:43 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-07-25 22:45:55 +0200 |
| commit | 852effa474c159398014da736ade6f0fea454de7 (patch) | |
| tree | 97da22c4758ca4156dc9fb7ac123c7a3b0a9e9f5 /src/manager/miscManager.c | |
| parent | ccba86d292a0e4c8a0e07325ac4fb25e5a58dc89 (diff) | |
Rename objects
Diffstat (limited to 'src/manager/miscManager.c')
| -rw-r--r-- | src/manager/miscManager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index 5d52ad2d..cca46468 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -129,7 +129,7 @@ void sub_08058F44(u32 unk0, u32 unk1, u32 unk2) { void sub_08058F84(u32 unk0, u32 unk1) { Entity* tmp; - tmp = CreateObject(OBJECT_21, 0, 0); + tmp = CreateObject(DIRT_PARTICLE, 0, 0); if (!tmp) return; tmp->x.HALF.HI = gRoomControls.origin_x + unk0; @@ -363,12 +363,12 @@ void MiscManager_TypeB(MiscManager* this) { } } -u32 sub_080593CC(MiscManager* this) { +bool32 sub_080593CC(MiscManager* this) { if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swim_state != 0 && gPlayerEntity.animationState == 0 && - (gPlayerState.field_0x90 & 0xF00) == 0x400) { + (gPlayerState.playerInput.field_0x90 & PLAYER_INPUT_ANY_DIRECTION) == PLAYER_INPUT_UP) { return EntityWithinDistance(&gPlayerEntity, this->unk_38, this->unk_3a + 0xC, 6); } - return 0; + return FALSE; } void MiscManager_TypeC(MiscManager* this) { |