diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-08 01:18:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 01:18:16 -0800 |
| commit | 1dacfa1745cc21d8b5fcebdfd1596d3f0ac0cfc3 (patch) | |
| tree | 66bf4f84b9b8ba42acafeabaf581612f25b4332c /include/script.h | |
| parent | 4a4c36104522061deb6ab4470cc726067e562d12 (diff) | |
| parent | 6241d4691e154ecc33974e68545b113c019dd733 (diff) | |
Merge pull request #253 from hatal175/castorwild
Diffstat (limited to 'include/script.h')
| -rw-r--r-- | include/script.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/include/script.h b/include/script.h index b59d8916..33ce1767 100644 --- a/include/script.h +++ b/include/script.h @@ -4,28 +4,28 @@ #include "entity.h" typedef struct ScriptExecutionContext { - u16* scriptInstructionPointer; - u32 intVariable; - u32 postScriptActions; - u8 unk_0C[0x4]; // unused - u16 wait; - u16 unk_12; - u32 condition; - u8 unk_18; - u8 unk_19; - u8 unk_1A; - u8 unk_1B; // unused - union SplitWord x; - union SplitWord y; + /*0x00*/ u16* scriptInstructionPointer; + /*0x03*/ u32 intVariable; + /*0x08*/ u32 postScriptActions; + /*0x0C*/ u8 unk_0C[0x4]; // unused + /*0x10*/ u16 wait; + /*0x12*/ u16 unk_12; + /*0x14*/ u32 condition; + /*0x18*/ u8 unk_18; + /*0x19*/ u8 unk_19; + /*0x1A*/ u8 unk_1A; + /*0x1B*/ u8 unk_1B; // unused + /*0x1C*/ union SplitWord x; + /*0x20*/ union SplitWord y; } ScriptExecutionContext; typedef struct { // Sync flags are used to synchronize scripts running on different entities - u32 syncFlags; - u16 commandIndex; - u8 commandSize; - u8 flags; - u8 unk_08; + /*0x0*/ u32 syncFlags; + /*0x4*/ u16 commandIndex; + /*0x6*/ u8 commandSize; + /*0x7*/ u8 flags; + /*0x8*/ u8 unk_08; } ActiveScriptInfo; extern ActiveScriptInfo gActiveScriptInfo; |
