pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

update get_variable, get_npc signatures

Browse Source
This commit is contained in:
Alex Bates 2020-08-15 19:49:26 +01:00
parent 3c8f57089b
commit 66d6883188
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/functions.h
View File

@ -9,10 +9,10 @@ void osCleanupThread(void);
void clone_model(u16 srcModelID, u16 newModelID); void clone_model(u16 srcModelID, u16 newModelID);
void update_collider_transform(s16 colliderID); void update_collider_transform(s16 colliderID);
s32 get_variable(script_context* script, s32 var); s32 get_variable(script_context* script, bytecode var);
s32 set_variable(script_context* script, s32 var, s32 value); s32 set_variable(script_context* script, bytecode var, s32 value);
f32 get_float_variable(script_context* script, s32 var); f32 get_float_variable(script_context* script, bytecode var);
f32 set_float_variable(script_context* script, s32 var, f32 value); f32 set_float_variable(script_context* script, bytecode var, f32 value);
void set_script_timescale(script_context* script, f32 timescale); void set_script_timescale(script_context* script, f32 timescale);
f32 sin_deg(f32 x); f32 sin_deg(f32 x);
f32 cos_deg(f32 x); f32 cos_deg(f32 x);
@ -32,8 +32,8 @@ void sort_items(void);
s32 is_ability_active(s32 arg0); s32 is_ability_active(s32 arg0);
f32 update_lerp(EASING easing, f32 start, f32 end, s32 elapsed, s32 duration); f32 update_lerp(EASING easing, f32 start, f32 end, s32 elapsed, s32 duration);
npc* get_npc_safe(NPC npcID); npc* get_npc_safe(s32 npcID);
npc* get_npc_unsafe(NPC npcID); npc* get_npc_unsafe(s32 npcID);
npc* resolve_npc(script_context* script, NPC npcID); npc* resolve_npc(script_context* script, NPC npcID);
f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by); f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by);

4
src/code_13870_len_6980.c
View File

@ -42,9 +42,9 @@ INCLUDE_ASM(code_13870_len_6980, render_npcs);
INCLUDE_ASM(code_13870_len_6980, npc_move_heading); 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); INCLUDE_ASM(code_13870_len_6980, enable_npc_shadow);

8
src/code_e92d0_len_5da0.c
View File

@ -407,17 +407,17 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_execute_next_command);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end); 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);
INCLUDE_ASM(code_e92d0_len_5da0, get_variable_index_alt); 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); INCLUDE_ASM(code_e92d0_len_5da0, si_goto_label);