From 7d1bbf62e1415530f31a469d737f79955a7c2b22 Mon Sep 17 00:00:00 2001 From: hedara90 <90hedara@gmail.com> Date: Thu, 13 Feb 2025 10:23:06 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Bassoonian --- asm/macros/event.inc | 4 +--- src/event_object_movement.c | 18 +++++++++--------- src/scrcmd.c | 8 ++++---- src/script_movement.c | 12 +++++------- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 3018a774b6..4c0bf54514 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -2440,9 +2440,7 @@ .2byte \dest .endm - @ hide any follower pokemon if present, - @ putting them into their pokeball; - @ by default waits for their movement to finish + @ Hides any follower Pokémon if present, putting them into their Poké Ball; by default waits for their movement to finish. .macro hidefollower wait=1 callnative ScrFunc_hidefollower .2byte \wait diff --git a/src/event_object_movement.c b/src/event_object_movement.c index e6c3c4ddf5..8b7733d4e4 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1928,8 +1928,8 @@ struct Pokemon *GetFirstLiveMon(void) { struct Pokemon *mon = &gPlayerParty[i]; if ((OW_MON_ALLOWED_SPECIES && GetMonData(mon, MON_DATA_SPECIES_OR_EGG) != VarGet(OW_MON_ALLOWED_SPECIES)) - || (OW_MON_ALLOWED_MET_LVL && GetMonData(mon, MON_DATA_MET_LEVEL) != VarGet(OW_MON_ALLOWED_MET_LVL)) - || (OW_MON_ALLOWED_MET_LOC && GetMonData(mon, MON_DATA_MET_LOCATION) != VarGet(OW_MON_ALLOWED_MET_LOC))) + || (OW_MON_ALLOWED_MET_LVL && GetMonData(mon, MON_DATA_MET_LEVEL) != VarGet(OW_MON_ALLOWED_MET_LVL)) + || (OW_MON_ALLOWED_MET_LOC && GetMonData(mon, MON_DATA_MET_LOCATION) != VarGet(OW_MON_ALLOWED_MET_LOC))) { continue; } @@ -5514,7 +5514,7 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri // During a script, if player sidesteps or backsteps, // mirror player's direction instead if (ArePlayerFieldControlsLocked() - && gObjectEvents[gPlayerAvatar.objectEventId].facingDirection != gObjectEvents[gPlayerAvatar.objectEventId].movementDirection) + && gObjectEvents[gPlayerAvatar.objectEventId].facingDirection != gObjectEvents[gPlayerAvatar.objectEventId].movementDirection) { direction = gObjectEvents[gPlayerAvatar.objectEventId].movementDirection; objectEvent->facingDirectionLocked = TRUE; @@ -6412,9 +6412,9 @@ bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementAct // When player is moved via script, set copyable movement // for any followers via a lookup table - if (ArePlayerFieldControlsLocked() && - objectEvent->isPlayer && - FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT)) + if (ArePlayerFieldControlsLocked() + && objectEvent->isPlayer + && FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT)) { objectEvent->playerCopyableMovement = sActionIdToCopyableMovement[objectEvent->movementActionId]; } @@ -6445,9 +6445,9 @@ void ObjectEventClearHeldMovement(struct ObjectEvent *objectEvent) // When player is moved via script, set copyable movement // for any followers via a lookup table - if (ArePlayerFieldControlsLocked() && - objectEvent->isPlayer && - FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT)) + if (ArePlayerFieldControlsLocked() + && objectEvent->isPlayer + && FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT)) { objectEvent->playerCopyableMovement = sActionIdToCopyableMovement[objectEvent->movementActionId]; } diff --git a/src/scrcmd.c b/src/scrcmd.c index b45a0d76a3..9b4d00143a 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -998,7 +998,7 @@ bool8 ScrCmd_fadeinbgm(struct ScriptContext *ctx) return FALSE; } -struct ObjectEvent * ScriptHideFollower(void) +struct ObjectEvent *ScriptHideFollower(void) { struct ObjectEvent *obj = GetFollowerObject(); @@ -1030,9 +1030,9 @@ bool8 ScrCmd_applymovement(struct ScriptContext *ctx) gObjectEvents[GetObjectEventIdByLocalId(localId)].directionOverwrite = DIR_NONE; ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); sMovingNpcId = localId; - if (localId != OBJ_EVENT_ID_FOLLOWER && - !FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT) - && (movementScript < Common_Movement_FollowerSafeStart || movementScript > Common_Movement_FollowerSafeEnd)) + if (localId != OBJ_EVENT_ID_FOLLOWER + && !FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT) + && (movementScript < Common_Movement_FollowerSafeStart || movementScript > Common_Movement_FollowerSafeEnd)) { ScriptHideFollower(); } diff --git a/src/script_movement.c b/src/script_movement.c index 28e9e02a47..80d9b323f6 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -215,19 +215,17 @@ static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, cons u8 nextMoveActionId; struct ObjectEvent *obj = &gObjectEvents[objEventId]; - if (ObjectEventIsHeldMovementActive(obj) && - !ObjectEventClearHeldMovementIfFinished(obj)) + if (ObjectEventIsHeldMovementActive(obj) && !ObjectEventClearHeldMovementIfFinished(obj)) { // If, while undergoing scripted movement, // a non-player object collides with an active follower pokemon, // put that follower into a pokeball // (sTimer helps limit this expensive check to once per step) - if (OW_FOLLOWERS_SCRIPT_MOVEMENT && - gSprites[obj->spriteId].sTimer == 1 && - (objEventId = GetObjectObjectCollidesWith(obj, 0, 0, TRUE)) < OBJECT_EVENTS_COUNT && + if (OW_FOLLOWERS_SCRIPT_MOVEMENT && gSprites[obj->spriteId].sTimer == 1 + && (objEventId = GetObjectObjectCollidesWith(obj, 0, 0, TRUE)) < OBJECT_EVENTS_COUNT // switch `obj` to follower - ((obj = &gObjectEvents[objEventId])->movementType == MOVEMENT_TYPE_FOLLOW_PLAYER) && - gSprites[obj->spriteId].sTypeFuncId != 0) + && ((obj = &gObjectEvents[objEventId])->movementType == MOVEMENT_TYPE_FOLLOW_PLAYER) + && gSprites[obj->spriteId].sTypeFuncId != 0) { ClearObjectEventMovement(obj, &gSprites[obj->spriteId]); ScriptMovement_StartObjectMovementScript(obj->localId, obj->mapNum, obj->mapGroup, EnterPokeballMovement);