diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-29 01:01:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 01:01:37 -0800 |
| commit | c2f081600bca5c3f1f82d7bac8bc5827faf0d17a (patch) | |
| tree | d7f8fb576cff5d3a1ff7c025e120d15a725a9580 /src/script.c | |
| parent | 56688ac226db420c7b8ee7080f7185da58437fbc (diff) | |
| parent | 72509b18a0406f93b6ffc59904cc2c09c0adbf80 (diff) | |
Merge pull request #676 from notyourav/v
label some asm functions
Diffstat (limited to 'src/script.c')
| -rw-r--r-- | src/script.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script.c b/src/script.c index 8216a438..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; } } |