diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-04-06 21:38:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 21:38:14 -0700 |
| commit | c4d18cf682acfd413201acb5b0630bb367d1298f (patch) | |
| tree | e7a0efc692ed68f9f531be3b895584f5b65a20b5 /include | |
| parent | d71929c323af4457c657191e52f8a2abd2175d5d (diff) | |
| parent | d3c5ce50f0e973db16fda93552d4c412fe302551 (diff) | |
Merge pull request #487 from hatal175/fade
Add fade flags enum
Diffstat (limited to 'include')
| -rw-r--r-- | include/fade.h | 8 | ||||
| -rw-r--r-- | include/script.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/fade.h b/include/fade.h index 0de28da9..c9b30e10 100644 --- a/include/fade.h +++ b/include/fade.h @@ -3,6 +3,14 @@ #include "global.h" +typedef enum { + FADE_IN_OUT = 0x1, + FADE_BLACK_WHITE = 0x2, + FADE_INSTANT = 0x4, + FADE_MOSAIC = 0x8, + FADE_IRIS = 0x10, +} FadeFlags; + /** * @struct FadeControl * @brief Controls screen fading effects. diff --git a/include/script.h b/include/script.h index 519af3c3..3c4e5bfe 100644 --- a/include/script.h +++ b/include/script.h @@ -25,7 +25,7 @@ typedef struct { /*0x4*/ u16 commandIndex; /*0x6*/ u8 commandSize; /*0x7*/ u8 flags; - /*0x8*/ u8 unk_08; + /*0x8*/ u8 fadeSpeed; } ActiveScriptInfo; extern ActiveScriptInfo gActiveScriptInfo; |