diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 19:30:58 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 19:30:58 -0500 |
| commit | 4a903279df847024148b823990a317e79bc23c9f (patch) | |
| tree | b18c801e9ed8fea9b39b0b8bda6a567ca2b24e32 /include/constants | |
| parent | 1b303aeee87095400aae7c0d1ff9f94e83594691 (diff) | |
| parent | 48e63979c8a131bc059974194bd548f60dcdd24c (diff) | |
decompile task_new_game_prof_birch_speech_4
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/items.h | 3 | ||||
| -rw-r--r-- | include/constants/rgb.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/constants/items.h b/include/constants/items.h index 6135b8d6f..41d63c4a3 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -383,6 +383,9 @@ #define ITEM_MAGMA_EMBLEM 375 #define ITEM_OLD_SEA_MAP 376 +#define ITEM_LAST_ID 376 +#define ITEM_FIELD_ARROW ITEM_LAST_ID + 1 + #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) diff --git a/include/constants/rgb.h b/include/constants/rgb.h index 2c22df32a..8b323799f 100644 --- a/include/constants/rgb.h +++ b/include/constants/rgb.h @@ -2,6 +2,7 @@ #define GUARD_RGB_H #define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) +#define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F)) #define RGB_BLACK RGB(0, 0, 0) #define RGB_WHITE RGB(31, 31, 31) |