diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-07 18:18:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-07 18:18:00 -0400 |
| commit | fd1d75ce378aba3148a1fe9882e17c8cc790d5c2 (patch) | |
| tree | c8738398572990b0166c268d0eb32439db6eb702 /include/palette.h | |
| parent | 61cc1d55743715a64e793187f63d0f1f7a80b0e0 (diff) | |
| parent | f14d2765da6f01eccb08967fd6b22c3bdef2be98 (diff) | |
Merge branch 'master' into mauville_old_man
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 |