diff options
| author | fig02 <fig02srl@gmail.com> | 2020-09-29 20:18:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 20:18:46 -0400 |
| commit | 82968a7381dc9e851487175174ea19750f060beb (patch) | |
| tree | 6e60b15191080441f89f80ff5b2417fce6f94925 /include/color.h | |
| parent | a506801cd73d0aa6a071d61ab95f0c427e458000 (diff) | |
All Effect Overlays and z_effect_soft_sprite_old_init.c OK (#396)
* fix colliderinit typo
* dead sound done
* deadsound documentation
* blast done
* progress
* spk init
* progress
* spark done
* ss bomb ok
* bomb done
* cleanup
* progress
* progress
* almost done with bomb2
* clean up gossip stone
* more
* cleanup and format
* remove unused asm file
* nonmatching reloc
* done i think
* mistakes
* fix headers
* idk how that got in here
* EffectSsStick OK
* progress
* fix conflicting name
* progress
* splash OK
* uname fields
* progress
* lightning OK
* remove unwanted files
* kirakira ok
* kirakira done
* magma OK
* remove files
* ss_g_fire OK
* name funcs
* progress
* progress
* magma2 and kakera OK
* eff_ss_dead_dd OK
* fcircle OK
* stone1 OK
* sibuki2 OK
* dt_bubble OK
* deaddb OK
* sibuki OK
* dead_ds OK
* ice_smoke OK
* hitmark OK
* hahen OK
* k_fire OK
* en_fire OK
* starting colors
* color changes 1
* color switch done
* init file data migrated
* data cleanup
* ice_piece OK
* en_ice OK
* progress
* progress
* docs progress
* fix blast color names
* documentation pass 1
* progress
* cleanup pass 2
* touchups
* added to functions.h
* small changes
* fix functions.h
* renaming progress
* name progress
* color enum
* more cleanups
* enice changes
* final cleanups
* remove unwanted file
* lightning -> shock
* pr suggestions
* fix comment
* remove unwanted comments
Diffstat (limited to 'include/color.h')
| -rw-r--r-- | include/color.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/color.h b/include/color.h index 272403825..3152fd3cf 100644 --- a/include/color.h +++ b/include/color.h @@ -5,17 +5,17 @@ typedef struct { u8 r, g, b; } Color_RGB8; +typedef struct { + u8 r, g, b, a; +} Color_RGBA8; + +// only use when necessary for alignment purposes typedef union { struct { u8 r, g, b, a; }; u32 rgba; -} Color_RGBA8; - -// Variant without u32 union -typedef struct { - u8 r, g, b, a; -} Color_RGBA8_n; +} Color_RGBA8_u32; typedef struct { f32 r, g, b, a; |