diff options
| author | theo3 <arisstephenson2@gmail.com> | 2022-03-17 19:13:56 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2022-03-17 19:16:43 -0700 |
| commit | ef470547e04f2cbc50b98d6578932f1188d25dbd (patch) | |
| tree | 4a5e5bffb8ea301bd15b8bda4627c48ccf052cce /src/script.c | |
| parent | 33579844948ca5c2ed9e1e353fba8b9571f7104d (diff) | |
cleanup
Diffstat (limited to 'src/script.c')
| -rw-r--r-- | src/script.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script.c b/src/script.c index f08b600e..a6a4e36c 100644 --- a/src/script.c +++ b/src/script.c @@ -1634,8 +1634,8 @@ void EquipItem(Entity* entity, ScriptExecutionContext* context) { ForceEquipItem(item, slot); } -void sub_0807F29C(Entity* entity, ScriptExecutionContext* context) { - sub_0805ED14((void*)context->intVariable); +void SetInputMacro(Entity* entity, ScriptExecutionContext* context) { + InitPlayerMacro((void*)context->intVariable); } void sub_0807F2A8(Entity* entity, ScriptExecutionContext* context) { @@ -1646,8 +1646,8 @@ void sub_0807F2A8(Entity* entity, ScriptExecutionContext* context) { } } -void WaitForFrameHiBit(Entity* entity, ScriptExecutionContext* context) { - if ((entity->frame & 0x80) != 0) { +void WaitForAnimDone(Entity* entity, ScriptExecutionContext* context) { + if ((entity->frame & ANIM_DONE) != 0) { gActiveScriptInfo.flags |= 1; } else { gActiveScriptInfo.commandSize = 0; @@ -1655,7 +1655,7 @@ void WaitForFrameHiBit(Entity* entity, ScriptExecutionContext* context) { } void WaitForPlayerFrameHiBit(Entity* entity, ScriptExecutionContext* context) { - if ((gPlayerEntity.frame & 0x80) != 0) { + if ((gPlayerEntity.frame & ANIM_DONE) != 0) { gActiveScriptInfo.flags |= 1; } else { gActiveScriptInfo.commandSize = 0; |
