diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/event_object_movement.h | 1 | ||||
| -rw-r--r-- | include/constants/field_effects.h | 62 | ||||
| -rw-r--r-- | include/constants/trainer_tower.h | 17 |
3 files changed, 70 insertions, 10 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 008d3a117..62c5a2ef2 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -83,6 +83,7 @@ #define MOVEMENT_TYPE_VS_SEEKER_4E 0x4E #define MOVEMENT_TYPE_VS_SEEKER_4F 0x4F #define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST 0x50 +#define MOVEMENT_TYPES_COUNT 0x51 #define MOVEMENT_ACTION_FACE_DOWN 0x0 #define MOVEMENT_ACTION_FACE_UP 0x1 diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 92795246a..47b5f2bed 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -1,16 +1,16 @@ #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 -#define FLDEFF_SHADOW 3 -#define FLDEFF_TALL_GRASS 4 -#define FLDEFF_RIPPLE 5 -#define FLDEFF_FIELD_MOVE_SHOW_MON 6 -#define FLDEFF_ASH 7 -#define FLDEFF_SURF_BLOB 8 -#define FLDEFF_USE_SURF 9 +#define FLDEFF_EXCLAMATION_MARK_ICON 0 +#define FLDEFF_USE_CUT_ON_GRASS 1 +#define FLDEFF_USE_CUT_ON_TREE 2 +#define FLDEFF_SHADOW 3 +#define FLDEFF_TALL_GRASS 4 +#define FLDEFF_RIPPLE 5 +#define FLDEFF_FIELD_MOVE_SHOW_MON 6 +#define FLDEFF_ASH 7 +#define FLDEFF_SURF_BLOB 8 +#define FLDEFF_USE_SURF 9 #define FLDEFF_DUST 10 #define FLDEFF_USE_SECRET_POWER_CAVE 11 #define FLDEFF_JUMP_TALL_GRASS 12 @@ -72,4 +72,46 @@ #define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos +#define FLDEFF_PAL_TAG_GENERAL_0 0x1004 +#define FLDEFF_PAL_TAG_GENERAL_1 0x1005 +#define FLDEFF_PAL_TAG_ASH 0x100D +#define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F + +#define FLDEFFOBJ_SHADOW_S 0 +#define FLDEFFOBJ_SHADOW_M 1 +#define FLDEFFOBJ_SHADOW_L 2 +#define FLDEFFOBJ_SHADOW_XL 3 +#define FLDEFFOBJ_TALL_GRASS 4 +#define FLDEFFOBJ_RIPPLE 5 +#define FLDEFFOBJ_ASH 6 +#define FLDEFFOBJ_SURF_BLOB 7 +#define FLDEFFOBJ_ARROW 8 +#define FLDEFFOBJ_GROUND_IMPACT_DUST 9 +#define FLDEFFOBJ_JUMP_TALL_GRASS 10 +#define FLDEFFOBJ_SAND_FOOTPRINTS 11 +#define FLDEFFOBJ_JUMP_BIG_SPLASH 12 +#define FLDEFFOBJ_SPLASH 13 +#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14 +#define FLDEFFOBJ_LONG_GRASS 15 +#define FLDEFFOBJ_JUMP_LONG_GRASS 16 +#define FLDEFFOBJ_UNUSED_GRASS 17 +#define FLDEFFOBJ_UNUSED_GRASS_2 18 +#define FLDEFFOBJ_UNUSED_SAND 19 +#define FLDEFFOBJ_WATER_SURFACING 20 +#define FLDEFFOBJ_REFLECTION_DISTORTION 21 +#define FLDEFFOBJ_SPARKLE 22 +#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23 +#define FLDEFFOBJ_TREE_DISGUISE 24 +#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25 +#define FLDEFFOBJ_BIRD 26 +#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27 +#define FLDEFFOBJ_SAND_DISGUISE 28 +#define FLDEFFOBJ_SAND_PILE 29 +#define FLDEFFOBJ_SHORT_GRASS 30 +#define FLDEFFOBJ_HOT_SPRINGS_WATER 31 +#define FLDEFFOBJ_ASH_PUFF 32 +#define FLDEFFOBJ_ASH_LAUNCH 33 +#define FLDEFFOBJ_BUBBLES 34 +#define FLDEFFOBJ_SMALL_SPARKLE 35 + #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H diff --git a/include/constants/trainer_tower.h b/include/constants/trainer_tower.h index 6372a30e8..ea0039ea1 100644 --- a/include/constants/trainer_tower.h +++ b/include/constants/trainer_tower.h @@ -4,12 +4,29 @@ #define CHALLENGE_TYPE_SINGLE 0 #define CHALLENGE_TYPE_DOUBLE 1 #define CHALLENGE_TYPE_KNOCKOUT 2 +#define CHALLENGE_TYPE_MIXED 3 // Mixed challenges use one of the above 3 for each floor #define CHALLENGE_STATUS_LOST 0 #define CHALLENGE_STATUS_UNK 1 // Never set, possibly e-Card related #define CHALLENGE_STATUS_NORMAL 2 // Not started or ongoing +#define TTPRIZE_HP_UP 0 +#define TTPRIZE_PROTEIN 1 +#define TTPRIZE_IRON 2 +#define TTPRIZE_CARBOS 3 +#define TTPRIZE_CALCIUM 4 +#define TTPRIZE_ZINC 5 +#define TTPRIZE_BRIGHT_POWDER 6 +#define TTPRIZE_WHITE_HERB 7 +#define TTPRIZE_MENTAL_HERB 8 +#define TTPRIZE_CHOICE_BAND 9 +#define TTPRIZE_KINGS_ROCK 10 +#define TTPRIZE_SCOPE_LENS 11 +#define TTPRIZE_METAL_COAT 12 +#define TTPRIZE_DRAGON_SCALE 13 +#define TTPRIZE_UP_GRADE 14 + #define MAX_TRAINER_TOWER_FLOORS 8 #define MAX_TRAINERS_PER_FLOOR 3 |