From 0c37f227a1dad1840c8e480a2ec251a5ea8698bb Mon Sep 17 00:00:00 2001 From: dark-samus Date: Mon, 12 Oct 2020 23:18:02 -0400 Subject: [PATCH] last one --- include/functions.h | 4 ++-- src/code_e79b0_len_1920.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/functions.h b/include/functions.h index 472f3b5d8a..31ba98407f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -57,8 +57,8 @@ s32 osGetId(); s32 func_800EF394(f32); s32 does_script_exist(s32 id); -ScriptInstance* start_script(Bytecode* script, s32 priority, s32 flags); -ScriptInstance* start_script_in_group(ScriptInstance* script, s32 priority, s32 flags, s32 groups); +ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialState); +ScriptInstance* start_script_in_group(Bytecode* initialLine, u8 priority, s32 initialState, u8 groupFlags); void func_8011B7C0(u16, s32, s32); void func_80137D88(s32, f32); diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index df2582b502..7adcf12f0d 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -162,7 +162,7 @@ void func_802C3390(ScriptInstance* script) { } #ifdef NON_MATCHING -ScriptInstance* start_script(Bytecode* initialLine, u8 priority, s32 initialState) { +ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialState) { ScriptInstance* newScript; s32 curScriptIndex; s32 scriptListCount; @@ -227,11 +227,11 @@ ScriptInstance* start_script(Bytecode* initialLine, u8 priority, s32 initialStat return newScript; } #else -INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script, Bytecode* initialLine, u8 priority, s32 initialState); +INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script, Bytecode* initialLine, s32 priority, s32 initialState); #endif #ifdef NON_MATCHING -ScriptInstance* start_script_in_group(Bytecode* initialLine, s8 priority, s32 initialState, s8 groupFlags) { +ScriptInstance* start_script_in_group(Bytecode* initialLine, u8 priority, s32 initialState, u8 groupFlags) { ScriptInstance* newScript; s32 scriptListCount; s32 i; @@ -297,8 +297,8 @@ ScriptInstance* start_script_in_group(Bytecode* initialLine, s8 priority, s32 in return newScript; } #else -INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script_in_group, Bytecode* initialLine, s8 priority, - s32 initialState, s8 groupFlags); +INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script_in_group, Bytecode* initialLine, u8 priority, + s32 initialState, u8 groupFlags); #endif INCLUDE_ASM(s32, "code_e79b0_len_1920", start_child_script);