From 66d6883188ba4a9b548c79eee8dd21ef343a02e4 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Sat, 15 Aug 2020 19:49:26 +0100 Subject: [PATCH] update get_variable, get_npc signatures --- include/functions.h | 12 ++++++------ src/code_13870_len_6980.c | 4 ++-- src/code_e92d0_len_5da0.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/functions.h b/include/functions.h index b7337bf4d0..90b5f223be 100644 --- a/include/functions.h +++ b/include/functions.h @@ -9,10 +9,10 @@ void osCleanupThread(void); void clone_model(u16 srcModelID, u16 newModelID); void update_collider_transform(s16 colliderID); -s32 get_variable(script_context* script, s32 var); -s32 set_variable(script_context* script, s32 var, s32 value); -f32 get_float_variable(script_context* script, s32 var); -f32 set_float_variable(script_context* script, s32 var, f32 value); +s32 get_variable(script_context* script, bytecode var); +s32 set_variable(script_context* script, bytecode var, s32 value); +f32 get_float_variable(script_context* script, bytecode var); +f32 set_float_variable(script_context* script, bytecode var, f32 value); void set_script_timescale(script_context* script, f32 timescale); f32 sin_deg(f32 x); f32 cos_deg(f32 x); @@ -32,8 +32,8 @@ void sort_items(void); s32 is_ability_active(s32 arg0); f32 update_lerp(EASING easing, f32 start, f32 end, s32 elapsed, s32 duration); -npc* get_npc_safe(NPC npcID); -npc* get_npc_unsafe(NPC npcID); +npc* get_npc_safe(s32 npcID); +npc* get_npc_unsafe(s32 npcID); npc* resolve_npc(script_context* script, NPC npcID); f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by); diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c index 501c48ca79..ce55a7beae 100644 --- a/src/code_13870_len_6980.c +++ b/src/code_13870_len_6980.c @@ -42,9 +42,9 @@ INCLUDE_ASM(code_13870_len_6980, render_npcs); INCLUDE_ASM(code_13870_len_6980, npc_move_heading); -npc* INCLUDE_ASM(code_13870_len_6980, get_npc_unsafe, NPC npcID); +npc* INCLUDE_ASM(code_13870_len_6980, get_npc_unsafe, s32 npcID); -npc* INCLUDE_ASM(code_13870_len_6980, get_npc_safe, NPC npcID); +npc* INCLUDE_ASM(code_13870_len_6980, get_npc_safe, s32 npcID); INCLUDE_ASM(code_13870_len_6980, enable_npc_shadow); diff --git a/src/code_e92d0_len_5da0.c b/src/code_e92d0_len_5da0.c index cd039dcf2f..be7d124206 100644 --- a/src/code_e92d0_len_5da0.c +++ b/src/code_e92d0_len_5da0.c @@ -407,17 +407,17 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_execute_next_command); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end); -s32 INCLUDE_ASM(code_e92d0_len_5da0, get_variable, script_context* script, s32 var); +s32 INCLUDE_ASM(code_e92d0_len_5da0, get_variable, script_context* script, bytecode var); INCLUDE_ASM(code_e92d0_len_5da0, get_variable_index); INCLUDE_ASM(code_e92d0_len_5da0, get_variable_index_alt); -s32 INCLUDE_ASM(code_e92d0_len_5da0, set_variable, script_context* script, s32 var, s32 value); +s32 INCLUDE_ASM(code_e92d0_len_5da0, set_variable, script_context* script, bytecode var, s32 value); -f32 INCLUDE_ASM(code_e92d0_len_5da0, get_float_variable, script_context* script, s32 var); +f32 INCLUDE_ASM(code_e92d0_len_5da0, get_float_variable, script_context* script, bytecode var); -f32 INCLUDE_ASM(code_e92d0_len_5da0, set_float_variable, script_context* script, s32 var, f32 value); +f32 INCLUDE_ASM(code_e92d0_len_5da0, set_float_variable, script_context* script, bytecode var, f32 value); INCLUDE_ASM(code_e92d0_len_5da0, si_goto_label);