diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:07:52 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:07:52 -0400 |
| commit | 402f2643bd9159638002b18010d09fa3309c1f9f (patch) | |
| tree | 2ccf4cd24a17630ed107bc5749eaf998927d5476 /include/constants/event_objects.h | |
| parent | d69a051df50232dbc0c2d0b595d5eeb0d5fb3133 (diff) | |
| parent | 7a6d4525c4066038832d85a45ed6df6ab4660309 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into field_player_avatar
Diffstat (limited to 'include/constants/event_objects.h')
| -rw-r--r-- | include/constants/event_objects.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index cccba35ff..2e9fcaa83 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -6,15 +6,15 @@ #define OBJ_EVENT_GFX_RED_SURF 2 #define OBJ_EVENT_GFX_RED_ITEM 3 #define OBJ_EVENT_GFX_RED_FISH 4 -#define OBJ_EVENT_GFX_RED_ITEM_COPY 5 -#define OBJ_EVENT_GFX_RED_FIELD_MOVE_BIKE 6 +#define OBJ_EVENT_GFX_RED_VS_SEEKER 5 +#define OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE 6 #define OBJ_EVENT_GFX_GREEN_NORMAL 7 #define OBJ_EVENT_GFX_GREEN_BIKE 8 #define OBJ_EVENT_GFX_GREEN_SURF 9 #define OBJ_EVENT_GFX_GREEN_ITEM 10 #define OBJ_EVENT_GFX_GREEN_FISH 11 -#define OBJ_EVENT_GFX_GREEN_ITEM_COPY 12 -#define OBJ_EVENT_GFX_GREEN_FIELD_MOVE_BIKE 13 +#define OBJ_EVENT_GFX_GREEN_VS_SEEKER 12 +#define OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE 13 #define OBJ_EVENT_GFX_RS_BRENDAN 14 #define OBJ_EVENT_GFX_RS_MAY 15 #define OBJ_EVENT_GFX_LITTLE_BOY 16 @@ -37,9 +37,9 @@ #define OBJ_EVENT_GFX_OLD_MAN_2 33 #define OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN 34 #define OBJ_EVENT_GFX_OLD_WOMAN 35 -#define OBJ_EVENT_GFX_TUBER_M_1 36 +#define OBJ_EVENT_GFX_TUBER_M_WATER 36 #define OBJ_EVENT_GFX_TUBER_F 37 -#define OBJ_EVENT_GFX_TUBER_M_2 38 +#define OBJ_EVENT_GFX_TUBER_M_LAND 38 #define OBJ_EVENT_GFX_CAMPER 39 #define OBJ_EVENT_GFX_PICNICKER 40 #define OBJ_EVENT_GFX_COOLTRAINER_M 41 @@ -154,12 +154,12 @@ #define OBJ_EVENT_GFX_DEOXYS_N 150 #define OBJ_EVENT_GFX_SS_ANNE 151 -#define NUM_OBJ_EVENT_GFX 239 +#define NUM_OBJ_EVENT_GFX 152 // 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_VARS 240 #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) |