diff options
| author | Reinmmar <herwig.orlich@gmail.com> | 2023-09-17 12:09:53 +0200 |
|---|---|---|
| committer | Reinmmar <herwig.orlich@gmail.com> | 2023-09-17 12:09:53 +0200 |
| commit | e8639051babd5a27745284f41fb60650bd08a976 (patch) | |
| tree | a8bcfe00b686d1914a862e845cc13de8bbf6b4f1 /src/beanstalkSubtask.c | |
| parent | 098e61f0e7b33772974460932af8061d16d149d3 (diff) | |
Labeled PlayerState and PlayerAction stuff
Diffstat (limited to 'src/beanstalkSubtask.c')
| -rw-r--r-- | src/beanstalkSubtask.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/beanstalkSubtask.c b/src/beanstalkSubtask.c index 41dd45c3..5271ab5a 100644 --- a/src/beanstalkSubtask.c +++ b/src/beanstalkSubtask.c @@ -170,7 +170,7 @@ u32 UpdatePlayerCollision(void) { u32 index; const s16* ptr1; const s16* ptr2; - s32 tmp1; + s32 framestate; u32 tmp2; u32 tmp3; // There are some weird assignment necessary to access gPlayerEntity.animationState correctly. @@ -178,18 +178,18 @@ u32 UpdatePlayerCollision(void) { u32 animationState2; u32 animationState3; - if (gPlayerState.framestate == 0) { - tmp1 = gPlayerState.framestate_last; + if (gPlayerState.framestate == PL_STATE_IDLE) { + framestate = gPlayerState.framestate_last; } else { - tmp1 = gPlayerState.framestate; + framestate = gPlayerState.framestate; } - switch (tmp1) { - case 3: + switch (framestate) { + case PL_STATE_GUSTJAR: return 0; - case 0x12: + case PL_STATE_DIE: return 0; - case 0x16: + case PL_STATE_DROWN: return 0; } |
