diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 13:57:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 13:57:05 -0500 |
| commit | c1d17b2df183689c0befd3c7bc08810308f2bcd2 (patch) | |
| tree | d2e6483613f61af4142e6c313ac1007552a52941 /include/script.h | |
| parent | 1cfeae9ffa11bb86a214721bb264f26ca8cb7d5a (diff) | |
| parent | 13357596b7ed70246a00d438ee37dc1c84b78415 (diff) | |
Merge branch 'master' into doc-routes2
Diffstat (limited to 'include/script.h')
| -rw-r--r-- | include/script.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/script.h b/include/script.h index c0b23e248..2fb732396 100644 --- a/include/script.h +++ b/include/script.h @@ -48,7 +48,7 @@ void ScriptContext2_RunNewScript(const u8 *ptr); u8 *mapheader_get_tagged_pointer(u8 tag); void mapheader_run_script_by_tag(u8 tag); u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag); -void mapheader_run_script_with_tag_x1(void); +void RunOnLoadMapScript(void); void mapheader_run_script_with_tag_x3(void); void mapheader_run_script_with_tag_x5(void); void mapheader_run_script_with_tag_x7(void); @@ -62,7 +62,7 @@ u8 *GetRamScript(u8 objectId, u8 *script); bool32 sub_80991F8(void); u8 *sub_8099244(void); void sub_80992A0(u8 *script, u16 scriptSize); -bool32 sub_8069DFC(void); +bool32 ValidateRamScript(void); void MEventSetRamScript(u8 * script, u16 scriptSize); u8 * sub_8069E48(void); void sub_8069998(u8 var); |