summaryrefslogtreecommitdiff
path: root/src/playerUtils.c
diff options
context:
space:
mode:
authorReinmmar <herwig.orlich@gmail.com>2023-09-17 12:09:53 +0200
committerReinmmar <herwig.orlich@gmail.com>2023-09-17 12:09:53 +0200
commite8639051babd5a27745284f41fb60650bd08a976 (patch)
treea8bcfe00b686d1914a862e845cc13de8bbf6b4f1 /src/playerUtils.c
parent098e61f0e7b33772974460932af8061d16d149d3 (diff)
Labeled PlayerState and PlayerAction stuff
Diffstat (limited to 'src/playerUtils.c')
-rw-r--r--src/playerUtils.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/playerUtils.c b/src/playerUtils.c
index 7514488c..7df365a9 100644
--- a/src/playerUtils.c
+++ b/src/playerUtils.c
@@ -1043,15 +1043,15 @@ void DetermineRButtonInteraction(void) {
}
bool32 sub_080782C0(void) {
- u8 tmp;
+ u8 framestate;
Entity* entity;
if (gPlayerState.framestate == PL_STATE_IDLE) {
- tmp = gPlayerState.framestate_last;
+ framestate = gPlayerState.framestate_last;
} else {
- tmp = gPlayerState.framestate;
+ framestate = gPlayerState.framestate;
}
- switch (tmp) {
+ switch (framestate) {
case PL_STATE_SWORD:
case PL_STATE_GUSTJAR:
case PL_STATE_C:
@@ -1877,8 +1877,8 @@ void sub_080797EC(void) {
gPlayerState.prevAnim = 0x6c;
return;
} else if (gPlayerState.sword_state == 0) {
- if (gPlayerState.framestate == 0) {
- gPlayerState.framestate = 1;
+ if (gPlayerState.framestate == PL_STATE_IDLE) {
+ gPlayerState.framestate = PL_STATE_WALK;
}
animation = 0x404;
} else {
@@ -1924,8 +1924,8 @@ void sub_080797EC(void) {
}
}
} else {
- if (gPlayerState.framestate == 0) {
- gPlayerState.framestate = 1;
+ if (gPlayerState.framestate == PL_STATE_IDLE) {
+ gPlayerState.framestate = PL_STATE_WALK;
}
if ((gPlayerState.flags & PL_USE_LANTERN) != 0) {
animation = 0x608;