diff options
| author | Henny022p <info@henny022.de> | 2021-02-19 10:33:19 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2021-02-19 10:33:19 +0100 |
| commit | b2a06931667217640c1df4ff71e41d4d065c66a2 (patch) | |
| tree | 9a951d4127c2e0883aa338503551de129d307398 /include | |
| parent | 39f682b74db1bffe8afa72397b70482821e75215 (diff) | |
moved script related functions from functions.h to script.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/script.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/functions.h b/include/functions.h index 7015294b..f2ced8b0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -9,7 +9,6 @@ #include "player.h" #include "structures.h" #include "room.h" -#include "script.h" // Identified - to be sorted into header files extern u32 Random(void); @@ -24,7 +23,6 @@ extern u32 CheckKinstoneFused(u32); extern void ForceEquipItem(u8, u8); extern void LoadRoomEntityList(); void CopyPosition(Entity*, Entity*); -extern ScriptExecutionContext* StartCutscene(Entity*, u16*); extern void ResolveEntityOnTop(Entity*, Entity*); extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*)); extern u32 GetAnimationState(Entity*); @@ -86,13 +84,11 @@ extern void sub_0806F69C(Entity*); extern void sub_0805E3A0(void*, u32); extern void sub_0806D0B0(Entity*); extern void sub_0807DD64(Entity*); -extern void sub_0807DDAC(Entity*, void(*function)(Entity*, ScriptExecutionContext*)); extern void sub_0807DDE4(Entity*); extern void sub_0806D02C(Entity*); extern u32 sub_0806F5A4(u32); extern void sub_08078784(Entity*, u32); extern void sub_0807DD50(Entity*); -extern void sub_0807DD94(Entity*, void(*function)(Entity*, ScriptExecutionContext*)); extern s32 sub_0806ED9C(Entity*, u32, u32); extern void sub_0807000C(Entity*); extern void sub_0805E47C(Entity*); diff --git a/include/script.h b/include/script.h index a3f29c84..93b7554c 100644 --- a/include/script.h +++ b/include/script.h @@ -30,4 +30,7 @@ extern void StartPlayerScript(u16*); extern void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32); +extern ScriptExecutionContext* StartCutscene(Entity*, u16*); +extern void sub_0807DDAC(Entity*, void(*function)(Entity*, ScriptExecutionContext*)); +extern void sub_0807DD94(Entity*, void(*function)(Entity*, ScriptExecutionContext*)); #endif |