diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-20 18:02:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-20 18:02:50 -0400 |
commit | aeeff84462973b267e62031a945603d96afed716 (patch) | |
tree | 046ce2a73b467844e95a490b1cfa9cdda5e5f4df /include/script.h | |
parent | d3bfb6cfc63f9f64295cbd864f98df9cf4c643b4 (diff) | |
parent | f0bf1e641cb8532611c97354beaf46afaca7c417 (diff) |
Merge pull request #780 from GriffinRichards/sync-scripts
Sync some scripts with pokeemerald
Diffstat (limited to 'include/script.h')
-rw-r--r-- | include/script.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/script.h b/include/script.h index 17effd358..28fb54878 100644 --- a/include/script.h +++ b/include/script.h @@ -42,12 +42,12 @@ void ScriptContext1_SetupScript(const u8 *ptr); void ScriptContext1_Stop(void); void EnableBothScriptContexts(void); void ScriptContext2_RunNewScript(const u8 *ptr); -void mapheader_run_script_with_tag_x1(void); -void mapheader_run_script_with_tag_x3(void); -void mapheader_run_script_with_tag_x5(void); -void mapheader_run_script_with_tag_x6(void); -bool8 mapheader_run_first_tag2_script_list_match(void); -void mapheader_run_first_tag4_script_list_match(void); +void RunOnLoadMapScript(void); +void RunOnTransitionMapScript(void); +void RunOnResumeMapScript(void); +void RunOnDiveWarpMapScript(void); +bool8 TryRunOnFrameMapScript(void); +void TryRunOnWarpIntoMapScript(void); void ClearRamScript(void); bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); const u8 *GetRamScript(u8 objectId, const u8 *script); |