diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-26 04:41:13 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-01-26 04:42:18 -0500 |
| commit | 9e5958122011a2d5092db57f07f14fd511fb6f42 (patch) | |
| tree | 316c5533951be13d21d8568a936d868a810ae27a /src/event_object_movement.c | |
| parent | 0064333e4aa1bacb42f840ba67d38a9aced8816e (diff) | |
Document object lock and some trainer approach
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 46d8d6d32..18e23b8e3 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -6579,7 +6579,7 @@ bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *objectEvent, struct { if (objectEvent->movementType == MOVEMENT_TYPE_HIDDEN) { - sub_80B4578(objectEvent); + SetHiddenTrainerMovement(objectEvent); return FALSE; } if (objectEvent->movementType != MOVEMENT_TYPE_TREE_DISGUISE && objectEvent->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) @@ -8971,13 +8971,14 @@ void DestroyExtraMovementTask(u8 taskId) DestroyTask(taskId); } -void sub_8098074(u8 var1, u8 var2) +// Used to freeze other objects except two trainers approaching for battle +void FreezeObjectEventsExceptTwo(u8 objectEventId1, u8 objectEventId2) { u8 i; for(i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if(i != var1 && i != var2 && + if(i != objectEventId1 && i != objectEventId2 && gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) FreezeObjectEvent(&gObjectEvents[i]); } |