summaryrefslogtreecommitdiff
path: root/src/playerUtils.c
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2023-12-28 21:58:54 -0800
committertheo3 <arisstephenson2@gmail.com>2023-12-28 21:58:54 -0800
commitd07c41664190a12c4f56d2e71eae8aa41f40ce21 (patch)
tree5b5fcbabc56e46060cd64bb3db9e3f07a119c998 /src/playerUtils.c
parent56688ac226db420c7b8ee7080f7185da58437fbc (diff)
message definitions
Diffstat (limited to 'src/playerUtils.c')
-rw-r--r--src/playerUtils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/playerUtils.c b/src/playerUtils.c
index c987c761..2cd630f7 100644
--- a/src/playerUtils.c
+++ b/src/playerUtils.c
@@ -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);