diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2024-01-08 09:25:47 -0600 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2024-02-02 15:39:01 -0600 |
| commit | 596ea5ebbb3e5a5dfab72fb7bee6d4802d8b13d4 (patch) | |
| tree | 4161db9bf2f0ad30895e9195e3bbaa7db56785cc /soh/src/code/z_player_lib.c | |
| parent | fe9dcf1fc3f82711f03f932e3f153dc4ba3cf7df (diff) | |
Vanilla Behavior Overhaul
Co-authored-by: jordanpg <jordanpg@users.noreply.github.com>
Diffstat (limited to 'soh/src/code/z_player_lib.c')
| -rw-r--r-- | soh/src/code/z_player_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index dfffa7729..1f136674b 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -564,8 +564,8 @@ uint8_t Player_IsCustomLinkModel() { } s32 Player_InBlockingCsMode(PlayState* play, Player* this) { - return (this->stateFlags1 & 0x20000080) || (this->csAction != 0) || (play->transitionTrigger == TRANS_TRIGGER_START) || - (this->stateFlags1 & 1) || (this->stateFlags3 & 0x80) || + return (this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_CUTSCENE)) || (this->csAction != 0) || (play->transitionTrigger == TRANS_TRIGGER_START) || + (this->stateFlags1 & PLAYER_STATE1_LOADING) || (this->stateFlags3 & PLAYER_STATE3_HOOKSHOT_TRAVELLING) || ((gSaveContext.magicState != MAGIC_STATE_IDLE) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0)); } |