diff options
author | yenatch <yenatch@gmail.com> | 2017-06-14 00:05:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-14 00:05:22 -0400 |
commit | 48a15638c63f2b3d4b2d12d346e466ddca006570 (patch) | |
tree | 89942e8cf1e40968b48759bf2b4e575912a2271b /include/palette.h | |
parent | e09e1da6c252e17cf6db429ad142b05dbf156548 (diff) | |
parent | 4e7297790f29987b1dd502fcf3b03ca76042c622 (diff) |
Merge pull request #316 from PikalaxALT/decoration
Decoration
Diffstat (limited to 'include/palette.h')
-rw-r--r-- | include/palette.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/include/palette.h b/include/palette.h index 37fcb4d65..193773d24 100644 --- a/include/palette.h +++ b/include/palette.h @@ -16,22 +16,22 @@ enum struct PaletteFadeControl { - u32 multipurpose1; - u8 delayCounter:6; - u16 y:5; // blend coefficient - u16 targetY:5; // target blend coefficient - u16 blendColor:15; - u16 active:1; - u16 multipurpose2:6; - u16 yDec:1; // whether blend coefficient is decreasing - u16 bufferTransferDisabled:1; - u16 mode:2; - u16 shouldResetBlendRegisters:1; - u16 hardwareFadeFinishing:1; - u16 softwareFadeFinishingCounter:5; - u16 softwareFadeFinishing:1; - u16 objPaletteToggle:1; - u8 deltaY:4; // rate of change of blend coefficient + /*0x00*/ u32 multipurpose1; + /*0x04*/ u8 delayCounter:6; + /*0x05*/ u16 y:5; // blend coefficient + /*0x05-06*/ u16 targetY:5; // target blend coefficient + /*0x07*/ u16 blendColor:15; + /*0x07*/ u16 active:1; + /*0x08*/ u16 multipurpose2:6; + /*0x08*/ u16 yDec:1; // whether blend coefficient is decreasing + /*0x08*/ u16 bufferTransferDisabled:1; + /*0x09*/ u16 mode:2; + /*0x09*/ u16 shouldResetBlendRegisters:1; + /*0x09*/ u16 hardwareFadeFinishing:1; + /*0x09-0a*/ u16 softwareFadeFinishingCounter:5; + /*0x0a*/ u16 softwareFadeFinishing:1; + /*0x0a*/ u16 objPaletteToggle:1; + /*0x0a*/ u8 deltaY:4; // rate of change of blend coefficient }; extern struct PaletteFadeControl gPaletteFade; |