diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-29 23:07:22 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-29 23:07:22 +0100 |
| commit | 242336c3851f33caa09af7ab332071d1ae9fb8bf (patch) | |
| tree | e7dfa362696260756c5585b90224fc2ac1291a5f /src/script.c | |
| parent | 870c08fad6576a219deca4e6f6cc46634267248e (diff) | |
| parent | c2f081600bca5c3f1f82d7bac8bc5827faf0d17a (diff) | |
Merge branch 'master' into enemies
Diffstat (limited to 'src/script.c')
| -rw-r--r-- | src/script.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/script.c b/src/script.c index 33fcbcf2..278ad227 100644 --- a/src/script.c +++ b/src/script.c @@ -1054,7 +1054,7 @@ void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context) { void ScriptCommand_SetPlayerIdle(Entity* entity, ScriptExecutionContext* context) { gPlayerState.controlMode = CONTROL_DISABLED; - sub_08078B48(); + PausePlayer(); } void ScriptCommand_EnablePlayerControl(Entity* entity, ScriptExecutionContext* context) { @@ -1129,7 +1129,7 @@ void ScriptCommand_0807E974(Entity* entity, ScriptExecutionContext* context) { MessageFromTarget(context->scriptInstructionPointer[1]); break; case 1: - if (gMessage.doTextBox & 0x7F) + if (gMessage.state & MESSAGE_ACTIVE) break; context->unk_18 = 2; context->unk_19 = 0xF; @@ -1191,7 +1191,7 @@ void ScriptCommand_AddInteractableFuser(Entity* entity, ScriptExecutionContext* } void ScriptCommand_WaitUntilTextboxCloses(Entity* entity, ScriptExecutionContext* context) { - if (gMessage.doTextBox & 0x7F) { + if (gMessage.state & MESSAGE_ACTIVE) { gActiveScriptInfo.commandSize = 0; } } @@ -1671,15 +1671,15 @@ void DeleteHitbox(Entity* entity, ScriptExecutionContext* context) { } void SetPriorityMessage(Entity* entity, ScriptExecutionContext* context) { - SetDefaultPriority(entity, PRIO_MESSAGE); + SetEntityPriority(entity, PRIO_MESSAGE); } void SetPriorityPlayerEvent(Entity* entity, ScriptExecutionContext* context) { - SetDefaultPriority(entity, PRIO_PLAYER_EVENT); + SetEntityPriority(entity, PRIO_PLAYER_EVENT); } void SetPriorityHighest(Entity* entity, ScriptExecutionContext* context) { - SetDefaultPriority(entity, PRIO_NO_BLOCK); + SetEntityPriority(entity, PRIO_NO_BLOCK); } void sub_0807F36C(Entity* entity, ScriptExecutionContext* context) { |