This commit is contained in:
dark-samus 2020-10-12 23:18:02 -04:00
parent 6468819806
commit 0c37f227a1
2 changed files with 7 additions and 7 deletions

View File

@ -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);

View File

@ -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);