diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/apprentice.h | 22 | ||||
| -rw-r--r-- | include/constants/event_objects.h | 46 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 |
3 files changed, 46 insertions, 24 deletions
diff --git a/include/constants/apprentice.h b/include/constants/apprentice.h new file mode 100644 index 000000000..9db58bb8e --- /dev/null +++ b/include/constants/apprentice.h @@ -0,0 +1,22 @@ +#ifndef GUARD_CONSTANTS_APPRENTICE_H +#define GUARD_CONSTANTS_APPRENTICE_H + +#define APPRENTICE_ASK_WHICH_LEVEL 0 +#define APPRENTICE_ASK_3SPECIES 1 +#define APPRENTICE_ASK_2SPECIES 2 +#define APPRENTICE_ASK_MOVES 3 +#define APPRENTICE_ASK_GIVE 4 +#define APPRENTICE_ASK_YES_NO 6 + +#define APPRENTICE_BUFF_SPECIES1 0 +#define APPRENTICE_BUFF_SPECIES2 1 +#define APPRENTICE_BUFF_SPECIES3 2 +#define APPRENTICE_BUFF_MOVE1 3 +#define APPRENTICE_BUFF_MOVE2 4 +#define APPRENTICE_BUFF_ITEM 5 +#define APPRENTICE_BUFF_NAME 6 +#define APPRENTICE_BUFF_EASY_CHAT 7 +#define APPRENTICE_BUFF_LEVEL 8 +#define APPRENTICE_BUFF_SPECIES4 9 + +#endif // GUARD_CONSTANTS_APPRENTICE_H diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index d04f0a1f9..4967c814d 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -6,36 +6,36 @@ #define EVENT_OBJ_GFX_BRENDAN_SURFING 2 #define EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE 3 #define EVENT_OBJ_GFX_QUINTY_PLUMP 4 -#define EVENT_OBJ_GFX_LITTLE_BOY_1 5 -#define EVENT_OBJ_GFX_LITTLE_GIRL_1 6 +#define EVENT_OBJ_GFX_NINJA_BOY 5 +#define EVENT_OBJ_GFX_TWIN 6 #define EVENT_OBJ_GFX_BOY_1 7 #define EVENT_OBJ_GFX_GIRL_1 8 #define EVENT_OBJ_GFX_BOY_2 9 #define EVENT_OBJ_GFX_GIRL_2 10 -#define EVENT_OBJ_GFX_LITTLE_BOY_2 11 -#define EVENT_OBJ_GFX_LITTLE_GIRL_2 12 +#define EVENT_OBJ_GFX_LITTLE_BOY 11 +#define EVENT_OBJ_GFX_LITTLE_GIRL 12 #define EVENT_OBJ_GFX_BOY_3 13 #define EVENT_OBJ_GFX_GIRL_3 14 -#define EVENT_OBJ_GFX_BOY_4 15 +#define EVENT_OBJ_GFX_RICH_BOY 15 #define EVENT_OBJ_GFX_WOMAN_1 16 #define EVENT_OBJ_GFX_FAT_MAN 17 -#define EVENT_OBJ_GFX_WOMAN_2 18 +#define EVENT_OBJ_GFX_POKEFAN_F 18 #define EVENT_OBJ_GFX_MAN_1 19 -#define EVENT_OBJ_GFX_WOMAN_3 20 -#define EVENT_OBJ_GFX_OLD_MAN_1 21 -#define EVENT_OBJ_GFX_OLD_WOMAN_1 22 +#define EVENT_OBJ_GFX_WOMAN_2 20 +#define EVENT_OBJ_GFX_EXPERT_M 21 +#define EVENT_OBJ_GFX_EXPERT_F 22 #define EVENT_OBJ_GFX_MAN_2 23 -#define EVENT_OBJ_GFX_WOMAN_4 24 -#define EVENT_OBJ_GFX_MAN_3 25 -#define EVENT_OBJ_GFX_WOMAN_5 26 +#define EVENT_OBJ_GFX_WOMAN_3 24 +#define EVENT_OBJ_GFX_POKEFAN_M 25 +#define EVENT_OBJ_GFX_WOMAN_4 26 #define EVENT_OBJ_GFX_COOK 27 -#define EVENT_OBJ_GFX_WOMAN_6 28 -#define EVENT_OBJ_GFX_OLD_MAN_2 29 -#define EVENT_OBJ_GFX_OLD_WOMAN_2 30 +#define EVENT_OBJ_GFX_LINK_RECEPTIONIST 28 +#define EVENT_OBJ_GFX_OLD_MAN 29 +#define EVENT_OBJ_GFX_OLD_WOMAN 30 #define EVENT_OBJ_GFX_CAMPER 31 #define EVENT_OBJ_GFX_PICNICKER 32 -#define EVENT_OBJ_GFX_MAN_4 33 -#define EVENT_OBJ_GFX_WOMAN_7 34 +#define EVENT_OBJ_GFX_MAN_3 33 +#define EVENT_OBJ_GFX_WOMAN_5 34 #define EVENT_OBJ_GFX_YOUNGSTER 35 #define EVENT_OBJ_GFX_BUG_CATCHER 36 #define EVENT_OBJ_GFX_PSYCHIC_M 37 @@ -66,8 +66,8 @@ #define EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES 62 #define EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE 63 #define EVENT_OBJ_GFX_PROF_BIRCH 64 -#define EVENT_OBJ_GFX_MAN_5 65 -#define EVENT_OBJ_GFX_MAN_6 66 +#define EVENT_OBJ_GFX_MAN_4 65 +#define EVENT_OBJ_GFX_MAN_5 66 #define EVENT_OBJ_GFX_REPORTER_M 67 #define EVENT_OBJ_GFX_REPORTER_F 68 #define EVENT_OBJ_GFX_BARD 69 @@ -96,8 +96,8 @@ #define EVENT_OBJ_GFX_MAY_SURFING 92 #define EVENT_OBJ_GFX_MAY_FIELD_MOVE 93 #define EVENT_OBJ_GFX_TRUCK 94 -#define EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX 95 -#define EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY 96 +#define EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX 95 +#define EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY 96 #define EVENT_OBJ_GFX_BIRCHS_BAG 97 #define EVENT_OBJ_GFX_ZIGZAGOON_1 98 #define EVENT_OBJ_GFX_ARTIST 99 @@ -117,7 +117,7 @@ #define EVENT_OBJ_GFX_MOVING_BOX 113 #define EVENT_OBJ_GFX_CABLE_CAR 114 #define EVENT_OBJ_GFX_SCIENTIST_2 115 -#define EVENT_OBJ_GFX_MAN_7 116 +#define EVENT_OBJ_GFX_DEVON_EMPLOYEE 116 #define EVENT_OBJ_GFX_AQUA_MEMBER_M 117 #define EVENT_OBJ_GFX_AQUA_MEMBER_F 118 #define EVENT_OBJ_GFX_MAGMA_MEMBER_M 119 @@ -190,7 +190,7 @@ #define EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL 186 #define EVENT_OBJ_GFX_LATIAS 187 #define EVENT_OBJ_GFX_LATIOS 188 -#define EVENT_OBJ_GFX_BOY_5 189 +#define EVENT_OBJ_GFX_GAMEBOY_KID 189 #define EVENT_OBJ_GFX_CONTEST_JUDGE 190 #define EVENT_OBJ_GFX_BRENDAN_WATERING 191 #define EVENT_OBJ_GFX_MAY_WATERING 192 diff --git a/include/constants/flags.h b/include/constants/flags.h index a74dffccf..ff403a299 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -501,7 +501,7 @@ #define FLAG_0x1F1 0x1F1 #define FLAG_0x1F2 0x1F2 #define FLAG_0x1F3 0x1F3 -#define FLAG_0x1F4 0x1F4 +#define FLAG_HIDDEN_ITEMS_START 0x1F4 #define FLAG_0x1F5 0x1F5 #define FLAG_0x1F6 0x1F6 #define FLAG_0x1F7 0x1F7 |