diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-14 21:48:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 21:48:21 -0500 |
| commit | 5f58ea02c66a7e1a7d0164ba497bfa2d7527328b (patch) | |
| tree | b55f6217cf8be32d8ca2794bab36138cf4315518 /include | |
| parent | b79773023447216290efb6f36f3fc8fef03ce593 (diff) | |
| parent | 70ff6c3b848ed16eaf63f0ff8445a8a6706250b7 (diff) | |
Merge pull request #1330 from sphericalice/hidden-to-buried
Rename 'hidden' Trainers/obj events to 'buried'
Diffstat (limited to 'include')
| -rwxr-xr-x | include/constants/event_object_movement.h | 2 | ||||
| -rw-r--r-- | include/event_object_movement.h | 4 | ||||
| -rw-r--r-- | include/trainer_see.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 6a4405b65..223650081 100755 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -64,7 +64,7 @@ #define MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS 0x3C #define MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS 0x3D #define MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS 0x3E -#define MOVEMENT_TYPE_HIDDEN 0x3F +#define MOVEMENT_TYPE_BURIED 0x3F #define MOVEMENT_TYPE_WALK_IN_PLACE_DOWN 0x40 #define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 #define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 247db9efc..1e754dcd9 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -255,7 +255,7 @@ void MovementType_CopyPlayer(struct Sprite *); void MovementType_TreeDisguise(struct Sprite *); void MovementType_MountainDisguise(struct Sprite *); void MovementType_CopyPlayerInGrass(struct Sprite *); -void MovementType_Hidden(struct Sprite *); +void MovementType_Buried(struct Sprite *); void MovementType_WalkInPlace(struct Sprite *); void MovementType_JogInPlace(struct Sprite *); void MovementType_RunInPlace(struct Sprite *); @@ -413,7 +413,7 @@ bool8 cph_IM_DIFFERENT(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *); -u8 MovementType_Hidden_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Buried_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *, struct Sprite *); diff --git a/include/trainer_see.h b/include/trainer_see.h index 7a20671ea..ab808c720 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -17,7 +17,7 @@ extern bool8 gTrainerApproachedPlayer; extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); -void SetHiddenTrainerMovement(struct ObjectEvent *var); +void SetBuriedTrainerMovement(struct ObjectEvent *var); void DoTrainerApproach(void); void TryPrepareSecondApproachingTrainer(void); u8 FldEff_ExclamationMarkIcon(void); |