diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-30 22:08:56 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-30 22:09:30 +0100 |
| commit | a818f1b7041898d7eee28b5c1c455ba3225e063f (patch) | |
| tree | 8a249012181db16dc1161efb36cf0abe7c0e9ff1 /src/manager/miscManager.c | |
| parent | 5676cb7890facded77c5cf32c6017fbf12a4d386 (diff) | |
Use new entity struct for player
Diffstat (limited to 'src/manager/miscManager.c')
| -rw-r--r-- | src/manager/miscManager.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index 2fe982bb..c250e517 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -164,7 +164,7 @@ void MiscManager_Type1(MiscManager* this) { PutAwayItems(); } if (super->timer == 60) { - gPlayerEntity.animationState = super->subtimer; + gPlayerEntity.base.animationState = super->subtimer; } if (!--super->timer) { super->action = 3; @@ -298,7 +298,7 @@ void sub_08059278(void) { void MiscManager_Type8(MiscManager* this) { super->action = 1; - gRoomControls.camera_target = &gPlayerEntity; + gRoomControls.camera_target = &gPlayerEntity.base; } void MiscManager_Type9(MiscManager* this) { @@ -363,9 +363,9 @@ void MiscManager_TypeB(MiscManager* this) { } bool32 sub_080593CC(MiscManager* this) { - if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swim_state != 0 && gPlayerEntity.animationState == 0 && + if (!(gPlayerState.flags & PL_MINISH) && gPlayerState.swim_state != 0 && gPlayerEntity.base.animationState == 0 && (gPlayerState.playerInput.heldInput & INPUT_ANY_DIRECTION) == INPUT_UP) { - return EntityWithinDistance(&gPlayerEntity, this->unk_38, this->unk_3a + 0xC, 6); + return EntityWithinDistance(&gPlayerEntity.base, this->unk_38, this->unk_3a + 0xC, 6); } return FALSE; } @@ -395,7 +395,7 @@ void MiscManager_TypeD(MiscManager* this) { if (gRoomVars.field_0x0) { StartPlayerScript(gUnk_08108380[gRoomControls.scroll_direction]); } else { - StartPlayerScript(gUnk_08108380[gPlayerEntity.animationState >> 1]); + StartPlayerScript(gUnk_08108380[gPlayerEntity.base.animationState >> 1]); } } DeleteThisEntity(); @@ -431,7 +431,7 @@ void MiscManager_TypeE(MiscManager* this) { #if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) void MiscManager_TypeF(MiscManager* this) { SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT); - if (gPlayerEntity.action == PLAYER_TALKEZLO) { + if (gPlayerEntity.base.action == PLAYER_TALKEZLO) { DeleteThisEntity(); } gInput.heldKeys |= SELECT_BUTTON; |