diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-05-09 05:10:23 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-05-09 05:10:23 -0500 |
commit | b570f87152bcde1d108e5e8302ef6d783ecbbbbd (patch) | |
tree | e00c31c3c2dc5a8c884ab7bdee51bb05ce391cf1 /include/palette.h | |
parent | d66c1c642c60191887fc4dda6d33bb5b8e9ff69c (diff) | |
parent | f14d2765da6f01eccb08967fd6b22c3bdef2be98 (diff) |
Merge master from pret
Diffstat (limited to 'include/palette.h')
-rw-r--r-- | include/palette.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/palette.h b/include/palette.h index 41cef4048..a1259d327 100644 --- a/include/palette.h +++ b/include/palette.h @@ -1,8 +1,6 @@ #ifndef GUARD_PALETTE_H #define GUARD_PALETTE_H -#include "global.h" - #define gPaletteFade_selectedPalettes (gPaletteFade.multipurpose1) // normal and fast fade #define gPaletteFade_blendCnt (gPaletteFade.multipurpose1) // hardware fade #define gPaletteFade_delay (gPaletteFade.multipurpose2) // normal and hardware fade |