From fc623d2abf07d35579a6560fea271941b3a67c0b Mon Sep 17 00:00:00 2001 From: Deokishisu <6993375+Deokishisu@users.noreply.github.com> Date: Sun, 14 Feb 2021 14:59:10 -0500 Subject: Rename "Hidden" Movement Type to "Buried" This commit mirrors the change to pokeemerald that renames `MOVEMENT_TYPE_HIDDEN` to `MOVEMENT_TYPE_BURIED` to avoid confusion between it and `MOVEMENT_TYPE_INVISIBLE`. As the files and function labels are not synced between the two repos, only the necessary changes were made based on what pokefirered calls its functions. More syncing of labels with pokeemerald will need to be done in the future. --- src/trainer_see.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/trainer_see.c') diff --git a/src/trainer_see.c b/src/trainer_see.c index 5681c4344..f393c4bbd 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -317,7 +317,7 @@ static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct O task->tFuncId++; if (trainerObj->movementType == MOVEMENT_TYPE_TREE_DISGUISE || trainerObj->movementType == MOVEMENT_TYPE_MOUNTAIN_DISGUISE) task->tFuncId = 6; - if (trainerObj->movementType == MOVEMENT_TYPE_HIDDEN) + if (trainerObj->movementType == MOVEMENT_TYPE_BURIED) task->tFuncId = 8; return TRUE; } @@ -393,7 +393,7 @@ static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task * task, st return FALSE; } -// Jump here if hidden in ash. Not used in FRLG. +// Jump here if buried in ash. Not used in FRLG. static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) { if (!ObjectEventIsMovementOverridden(trainerObj) -- cgit v1.2.3