diff options
| author | Henny022p <info@henny022.de> | 2021-03-04 19:49:46 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 14:53:33 +0100 |
| commit | a35c22e940efc7af89562e725575a4e79394ab2e (patch) | |
| tree | 1b5d435084b12852e6594b295f676bc113d8022a /include | |
| parent | 1a8fad358a3d224bb035b8698162540a1372575b (diff) | |
started naming script stuff
Diffstat (limited to 'include')
| -rw-r--r-- | include/greatFairy.h | 2 | ||||
| -rw-r--r-- | include/script.h | 6 | ||||
| -rw-r--r-- | include/structures.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/greatFairy.h b/include/greatFairy.h index 31a37c99..ae78ffda 100644 --- a/include/greatFairy.h +++ b/include/greatFairy.h @@ -41,7 +41,7 @@ extern const s16 GreatFairy_RippleOffsets[10]; extern u32 gUnk_02034350; extern RoomVars gRoomVars; extern Screen gScreen; -extern struct_02033280 gUnk_02033280; +extern struct_02033280 gActiveScriptInfo; extern u8 gUnk_0812079C[8]; extern s16 gSineTable[]; extern s8 gUnk_081207AC[]; diff --git a/include/script.h b/include/script.h index 9abc5291..201d0f71 100644 --- a/include/script.h +++ b/include/script.h @@ -3,12 +3,12 @@ #include "global.h" -typedef struct { - u16* unk_00; +typedef struct ScriptExecutionContext { + u16* scriptInstructionPointer; u32 unk_04; u32 unk_08; u8 unk_0C[0x4]; // unused - u16 unk_10; + u16 wait; u16 unk_12; u32 unk_14; u8 unk_18; diff --git a/include/structures.h b/include/structures.h index 59811d6f..42e9d3ab 100644 --- a/include/structures.h +++ b/include/structures.h @@ -121,13 +121,13 @@ extern struct_02024490 gUnk_02024490; typedef struct { u32 unk_00; - u16 unk_04; - u8 unk_06; - u8 unk_07; + u16 commandIndex; + u8 commandSize; + u8 flags; u8 unk_08; } struct_02033280; -extern struct_02033280 gUnk_02033280; +extern struct_02033280 gActiveScriptInfo; typedef struct { u16 unk_00; |