Update Await Input to use update fn
@@ -154,6 +154,8 @@ UBYTE ScriptUpdate_AwaitFade() { return !IsFading(); }
UBYTE ScriptUpdate_AwaitUIClosed() { return UIIsClosed(); }
+UBYTE ScriptUpdate_AwaitInputPres() { return (joy & await_input) != 0; }
+
UBYTE ScriptUpdate_Wait() {
if (wait_time == 0) {
return TRUE;
@@ -628,7 +630,7 @@ void Script_OverlayMoveTo_b() {
void Script_AwaitInput_b() {
await_input = script_cmd_args[0];
script_ptr += 1 + script_cmd_args_len;
- script_action_complete = FALSE;
+ script_update_fn = ScriptUpdate_AwaitInputPres;
}
/*
@@ -1986,9 +1988,6 @@ UBYTE ScriptLastFnComplete_b() {
return TRUE;
}
- if (last_fn == Script_AwaitInput_b && AwaitInputPressed()) {
- return TRUE;
- }
*/
/*
if (last_fn == Script_CameraMoveTo_b && SceneCameraAtDest())
