diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 9 | ||||
| -rw-r--r-- | include/script.h | 11 | ||||
| -rw-r--r-- | include/structures.h | 2 |
3 files changed, 10 insertions, 12 deletions
diff --git a/include/functions.h b/include/functions.h index 0a50c7d3..f3213239 100644 --- a/include/functions.h +++ b/include/functions.h @@ -23,7 +23,6 @@ extern u32 CheckKinstoneFused(u32); extern void ForceEquipItem(u8, u8); extern void LoadRoomEntityList(); void CopyPosition(Entity*, Entity*); -extern u32* StartCutscene(Entity*, u8*); extern void ResolveEntityOnTop(Entity*, Entity*); extern void EnemyFunctionHandler(Entity*, void (*const funcs[])(Entity*)); extern u32 GetAnimationState(Entity*); @@ -43,7 +42,6 @@ extern void UpdateAnimationVariableFrames(Entity*, u32); extern void CopyPositionAndSpriteOffset(Entity*, Entity*); extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32); extern u32 LoadFixedGFX(Entity*, u32); -extern void ExecuteScriptCommandSet(); extern void _DmaFill32(u32, void*, u32); extern Entity* CreateItemEntity(u32, u32, u32); void _DmaCopy(const void* src, void* dst, u32 size); @@ -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*, u32); 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*, u32); extern s32 sub_0806ED9C(Entity*, u32, u32); extern void sub_0807000C(Entity*); extern void sub_0805E47C(Entity*); @@ -106,7 +102,6 @@ extern void sub_0806FD3C(Entity*); extern u32 sub_0801E99C(Entity*); extern void sub_0807DD50(Entity*); extern void sub_0806F118(Entity*); -extern void sub_0807DD94(Entity*, u32); extern void sub_0805ED14(u32*); extern void sub_080A7C18(u32, u32, u32); extern void sub_08068BEC(Entity*, u32); @@ -222,9 +217,9 @@ extern void sub_080B1520(u32); extern struct_0807D1C4* sub_0807D1C4(u32); extern u32 sub_0807D24C(u32, const char*, u32); extern void sub_0807CF68(u32); -extern void sub_0807D20C(u32, const char*, u32); +extern u32 sub_0807D20C(u32, const char*, u32); extern u32 sub_0807CF88(u32, u8*); -extern void sub_0807D184(u32, const char*); +extern u32 sub_0807D184(u32, const char*); extern u32 sub_0806F520(); extern void sub_0806F4E8(Entity*); extern u32 sub_0806F3E4(Entity*); diff --git a/include/script.h b/include/script.h index 73d860e1..93b7554c 100644 --- a/include/script.h +++ b/include/script.h @@ -4,17 +4,17 @@ #include "global.h" typedef struct { - u16 * unk_00; + u16* unk_00; u32 unk_04; u32 unk_08; - u8 unk_0C[0x4];//unused + u8 unk_0C[0x4]; // unused u16 unk_10; u16 unk_12; u32 unk_14; u8 unk_18; u8 unk_19; u8 unk_1A; - u8 unk_1B;//unused + u8 unk_1B; // unused union SplitWord unk_1C; union SplitWord unk_20; } ScriptExecutionContext; @@ -26,8 +26,11 @@ extern u32 GetNextScriptCommandWord(u16*); extern u32 GetNextScriptCommandWordAfterCommandMetadata(u16*); extern u32 GetNextScriptCommandHalfwordAfterCommandMetadata(u16*); -extern void StartPlayerScript(u32); +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 diff --git a/include/structures.h b/include/structures.h index b5d29481..f1758ae5 100644 --- a/include/structures.h +++ b/include/structures.h @@ -177,6 +177,6 @@ static_assert(sizeof(BG3Buffer) == 0x1000); */ extern u8 gUnk_02022740[]; -extern u8 gUnk_02034490; +extern u8 gUnk_02034490[]; #endif |