diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/event_objects.h | 38 | ||||
| -rw-r--r-- | include/constants/field_effects.h | 2 | ||||
| -rw-r--r-- | include/constants/global.h | 1 |
3 files changed, 24 insertions, 17 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index c3862a7b1..2d51cd74d 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -154,22 +154,28 @@ #define OBJ_EVENT_GFX_DEOXYS_N 150 #define OBJ_EVENT_GFX_SS_ANNE 151 -#define OBJ_EVENT_GFX_VAR_0 240 -#define OBJ_EVENT_GFX_VAR_1 241 -#define OBJ_EVENT_GFX_VAR_2 242 -#define OBJ_EVENT_GFX_VAR_3 243 -#define OBJ_EVENT_GFX_VAR_4 244 -#define OBJ_EVENT_GFX_VAR_5 245 -#define OBJ_EVENT_GFX_VAR_6 246 -#define OBJ_EVENT_GFX_VAR_7 247 -#define OBJ_EVENT_GFX_VAR_8 248 -#define OBJ_EVENT_GFX_VAR_9 249 -#define OBJ_EVENT_GFX_VAR_A 250 -#define OBJ_EVENT_GFX_VAR_B 251 -#define OBJ_EVENT_GFX_VAR_C 252 -#define OBJ_EVENT_GFX_VAR_D 253 -#define OBJ_EVENT_GFX_VAR_E 254 -#define OBJ_EVENT_GFX_VAR_F 255 +#define NUM_OBJ_EVENT_GFX 239 + +// These are dynamic object gfx ids. +// They correspond with the values of the VAR_OBJ_GFX_ID_X vars. +// More info about them in include/constants/vars.h +#define OBJ_EVENT_GFX_VARS (NUM_OBJ_EVENT_GFX + 1) +#define OBJ_EVENT_GFX_VAR_0 (OBJ_EVENT_GFX_VARS + 0x0) // 240 +#define OBJ_EVENT_GFX_VAR_1 (OBJ_EVENT_GFX_VARS + 0x1) +#define OBJ_EVENT_GFX_VAR_2 (OBJ_EVENT_GFX_VARS + 0x2) +#define OBJ_EVENT_GFX_VAR_3 (OBJ_EVENT_GFX_VARS + 0x3) +#define OBJ_EVENT_GFX_VAR_4 (OBJ_EVENT_GFX_VARS + 0x4) +#define OBJ_EVENT_GFX_VAR_5 (OBJ_EVENT_GFX_VARS + 0x5) +#define OBJ_EVENT_GFX_VAR_6 (OBJ_EVENT_GFX_VARS + 0x6) +#define OBJ_EVENT_GFX_VAR_7 (OBJ_EVENT_GFX_VARS + 0x7) +#define OBJ_EVENT_GFX_VAR_8 (OBJ_EVENT_GFX_VARS + 0x8) +#define OBJ_EVENT_GFX_VAR_9 (OBJ_EVENT_GFX_VARS + 0x9) +#define OBJ_EVENT_GFX_VAR_A (OBJ_EVENT_GFX_VARS + 0xA) +#define OBJ_EVENT_GFX_VAR_B (OBJ_EVENT_GFX_VARS + 0xB) +#define OBJ_EVENT_GFX_VAR_C (OBJ_EVENT_GFX_VARS + 0xC) +#define OBJ_EVENT_GFX_VAR_D (OBJ_EVENT_GFX_VARS + 0xD) +#define OBJ_EVENT_GFX_VAR_E (OBJ_EVENT_GFX_VARS + 0xE) +#define OBJ_EVENT_GFX_VAR_F (OBJ_EVENT_GFX_VARS + 0xF) // 255 #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 5aa885b37..a4ecd3e21 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -1,6 +1,6 @@ #ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H #define GUARD_CONSTANTS_FIELD_EFFECTS_H - + #define FLDEFF_EXCLAMATION_MARK_ICON 0 #define FLDEFF_USE_CUT_ON_GRASS 1 #define FLDEFF_USE_CUT_ON_TREE 2 diff --git a/include/constants/global.h b/include/constants/global.h index ae9a0da3b..28fe660e3 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -31,6 +31,7 @@ #define BAG_POKEBALLS_COUNT 13 #define BAG_TMHM_COUNT 58 #define BAG_BERRIES_COUNT 43 +#define OBJECT_EVENT_TEMPLATES_COUNT 64 #define QUEST_LOG_SCENE_COUNT 4 |