fe16a2cdee
* First version of Vs. Seeker * Update movement.inc98f7e9978d (r1306721924)
* Update field_effect_scripts.s https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004 * Update field_effect_scripts.s https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024 * Update item_use.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401 * Update movement_action_func_tables.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828 * Update event_object_movement.c https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887 * Update overworld.c https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396 * Update vs_seeker.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158 * Update vs_seeker.c Addressed some cleanup comments from SBird * Update UpdateRandomTrainerRematches Fixed typo in ClearAllTrainerRematchStates Fixed types in GetRematchableTrainerLocalId * Updated UseVsSeekerEffect_2 * Updated UseVsSeekerEffect_3 * Updated UseVsSeekerEffect_4 * Fixed bug that allowed Vs Seeker to be used indoors in correct places Moved VsSeeker function declarations into header * Refactored FieldUseFunc_VsSeeker * Added curly braces to else case in FieldUseFunc_VsSeeker * renamed data[x] in Task_ResetObjectsRematchWantedState * Refactored Task_ResetObjectsRematchWantedState * Refactored VsSeekerResetObjectMovementAfterChargeComplete * Refactored ResetMovementOfRematchableTrainers * Refactored GatherNearbyTrainerInfo * Refactored Task_VsSeeker_3 * CanUseVsSeeker * Refactored GetVsSeekerResponseInArea * GetCurVsSeekerResponse refactored * Cleaned up GetTrainerFlagFromScript * Gave sensible names to Task_VsSeeker * Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater * Renamed UseVsSeeker Functions * Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned Removed extra VsSeeker animation code * Addressed PR feedback * Fixed issue with building non-modern * Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId * Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850 Removed the check to see if a map was not indoors to improve readability Made IsValidLocationForVsSeeker into a static function * Added changes in response to Jasper's feedback https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522 * Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392 * Removed ifdef tags around the repo unless neededb5dc744ced
126 lines
5.2 KiB
C
126 lines
5.2 KiB
C
#ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
|
|
#define GUARD_FIELD_EFFECT_CONSTANTS_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_DUST 10
|
|
#define FLDEFF_USE_SECRET_POWER_CAVE 11
|
|
#define FLDEFF_JUMP_TALL_GRASS 12
|
|
#define FLDEFF_SAND_FOOTPRINTS 13
|
|
#define FLDEFF_JUMP_BIG_SPLASH 14
|
|
#define FLDEFF_SPLASH 15
|
|
#define FLDEFF_JUMP_SMALL_SPLASH 16
|
|
#define FLDEFF_LONG_GRASS 17
|
|
#define FLDEFF_JUMP_LONG_GRASS 18
|
|
#define FLDEFF_UNUSED_GRASS 19
|
|
#define FLDEFF_UNUSED_GRASS_2 20
|
|
#define FLDEFF_UNUSED_SAND 21
|
|
#define FLDEFF_WATER_SURFACING 22
|
|
#define FLDEFF_BERRY_TREE_GROWTH_SPARKLE 23
|
|
#define FLDEFF_DEEP_SAND_FOOTPRINTS 24
|
|
#define FLDEFF_POKECENTER_HEAL 25
|
|
#define FLDEFF_USE_SECRET_POWER_TREE 26
|
|
#define FLDEFF_USE_SECRET_POWER_SHRUB 27
|
|
#define FLDEFF_TREE_DISGUISE 28
|
|
#define FLDEFF_MOUNTAIN_DISGUISE 29
|
|
#define FLDEFF_NPCFLY_OUT 30
|
|
#define FLDEFF_USE_FLY 31
|
|
#define FLDEFF_FLY_IN 32
|
|
#define FLDEFF_QUESTION_MARK_ICON 33
|
|
#define FLDEFF_FEET_IN_FLOWING_WATER 34
|
|
#define FLDEFF_BIKE_TIRE_TRACKS 35
|
|
#define FLDEFF_SAND_DISGUISE 36
|
|
#define FLDEFF_USE_ROCK_SMASH 37
|
|
#define FLDEFF_USE_DIG 38
|
|
#define FLDEFF_SAND_PILE 39
|
|
#define FLDEFF_USE_STRENGTH 40
|
|
#define FLDEFF_SHORT_GRASS 41
|
|
#define FLDEFF_HOT_SPRINGS_WATER 42
|
|
#define FLDEFF_USE_WATERFALL 43
|
|
#define FLDEFF_USE_DIVE 44
|
|
#define FLDEFF_POKEBALL_TRAIL 45
|
|
#define FLDEFF_HEART_ICON 46
|
|
#define FLDEFF_NOP_47 47
|
|
#define FLDEFF_NOP_48 48
|
|
#define FLDEFF_ASH_PUFF 49
|
|
#define FLDEFF_ASH_LAUNCH 50
|
|
#define FLDEFF_SWEET_SCENT 51
|
|
#define FLDEFF_SAND_PILLAR 52
|
|
#define FLDEFF_BUBBLES 53
|
|
#define FLDEFF_SPARKLE 54
|
|
#define FLDEFF_SECRET_POWER_CAVE 55
|
|
#define FLDEFF_SECRET_POWER_TREE 56
|
|
#define FLDEFF_SECRET_POWER_SHRUB 57
|
|
#define FLDEFF_CUT_GRASS 58
|
|
#define FLDEFF_FIELD_MOVE_SHOW_MON_INIT 59
|
|
#define FLDEFF_USE_TOMB_PUZZLE_EFFECT 60
|
|
#define FLDEFF_PCTURN_ON 61
|
|
#define FLDEFF_HALL_OF_FAME_RECORD 62
|
|
#define FLDEFF_USE_TELEPORT 63
|
|
#define FLDEFF_RAYQUAZA_SPOTLIGHT 64
|
|
#define FLDEFF_DESTROY_DEOXYS_ROCK 65
|
|
#define FLDEFF_MOVE_DEOXYS_ROCK 66
|
|
#define FLDEFF_USE_VS_SEEKER 67
|
|
#define FLDEFF_X_ICON 68
|
|
#define FLDEFF_DOUBLE_EXCL_MARK_ICON 69
|
|
|
|
#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
|
|
#define FLDEFFOBJ_RAYQUAZA 36
|
|
|
|
#define FLDEFF_PAL_TAG_CUT_GRASS 0x1000
|
|
#define FLDEFF_PAL_TAG_SECRET_POWER_TREE 0x1003
|
|
#define FLDEFF_PAL_TAG_GENERAL_0 0x1004
|
|
#define FLDEFF_PAL_TAG_GENERAL_1 0x1005
|
|
#define FLDEFF_PAL_TAG_POKEBALL_GLOW 0x1007
|
|
#define FLDEFF_PAL_TAG_SECRET_POWER_PLANT 0x1008
|
|
#define FLDEFF_PAL_TAG_POKEBALL_TRAIL 0x1009
|
|
#define FLDEFF_PAL_TAG_ASH 0x100D
|
|
#define FLDEFF_PAL_TAG_SAND_PILLAR 0x100E
|
|
#define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F
|
|
#define FLDEFF_PAL_TAG_HOF_MONITOR 0x1010
|
|
#define FLDEFF_PAL_TAG_UNKNOWN 0x1011
|
|
|
|
#endif // GUARD_FIELD_EFFECT_CONSTANTS_H
|