diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-29 01:01:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 01:01:37 -0800 |
| commit | c2f081600bca5c3f1f82d7bac8bc5827faf0d17a (patch) | |
| tree | d7f8fb576cff5d3a1ff7c025e120d15a725a9580 /src/playerUtils.c | |
| parent | 56688ac226db420c7b8ee7080f7185da58437fbc (diff) | |
| parent | 72509b18a0406f93b6ffc59904cc2c09c0adbf80 (diff) | |
Merge pull request #676 from notyourav/v
label some asm functions
Diffstat (limited to 'src/playerUtils.c')
| -rw-r--r-- | src/playerUtils.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/playerUtils.c b/src/playerUtils.c index c987c761..9ab584e5 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -462,7 +462,7 @@ Entity* CreatePlayerItemWithParent(ItemBehavior* this, u32 id) { } void* CreateItemGetPlayerItemWithParent(ItemBehavior* this) { - GenericEntity* playerItem = (GenericEntity*)CreateItemGetEntity(); + GenericEntity* playerItem = (GenericEntity*)CreateAuxPlayerEntity(); if (playerItem != NULL) { playerItem->base.id = gItemDefinitions[this->behaviorId].playerItemId; playerItem->base.kind = PLAYER_ITEM; @@ -501,7 +501,7 @@ Entity* CreatePlayerItem(u32 id, u32 type, u32 type2, u32 unk) { Entity* sub_08077CF8(u32 id, u32 type, u32 type2, u32 unk) { GenericEntity* ent; - ent = (GenericEntity*)CreateItemGetEntity(); + ent = (GenericEntity*)CreateAuxPlayerEntity(); if (ent != NULL) { ent->base.flags = ENT_COLLIDE; ent->base.kind = PLAYER_ITEM; @@ -988,7 +988,7 @@ bool32 sub_08078140(ChargeState* info) { void ForceSetPlayerState(u32 framestate) { gPlayerState.framestate = framestate; gPlayerEntity.flags &= ~ENT_COLLIDE; - sub_08078B48(); + PausePlayer(); } void DetermineRButtonInteraction(void) { @@ -1504,7 +1504,7 @@ void SetPlayerItemGetState(Entity* item, u8 param_2, u8 param_3) { DeleteClones(); } -void sub_08078B48(void) { +void PausePlayer(void) { gPlayerState.field_0x7 |= 0x80; gPlayerState.keepFacing |= 0x80; gPlayerState.field_0xa |= 0x80; @@ -2494,7 +2494,7 @@ u32 sub_08079FD4(Entity* this, u32 param_2) { void UpdatePlayerPalette(void) { u32 palette; - if ((gPlayerState.hurtBlinkSpeed != 0) && ((gMessage.doTextBox & 0x7f) == 0)) { + if ((gPlayerState.hurtBlinkSpeed != 0) && ((gMessage.state & MESSAGE_ACTIVE) == 0)) { gPlayerState.hurtBlinkSpeed--; } palette = GetPlayerPalette(FALSE); |