From 712669c822af2e7d5089f667069a71d214062530 Mon Sep 17 00:00:00 2001
From: Ariel A <24759293+aarant@users.noreply.github.com>
Date: Sat, 29 Jul 2023 13:52:22 -0400
Subject: [PATCH] Added support for follower bobbing. See event_objects.h

---
 .../object_events/pics/pokemon/togetic.png    | Bin 4693 -> 8101 bytes
 include/constants/event_objects.h             |   4 ++
 src/event_object_movement.c                   |  59 ++++++++++++------
 3 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/graphics/object_events/pics/pokemon/togetic.png b/graphics/object_events/pics/pokemon/togetic.png
index 74f8346b6a3008a974b85707240ff086f8fb643f..a7da7b76af5229f9cc7a271b6db40e4c361971b5 100644
GIT binary patch
literal 8101
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

delta 4575
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
JPDHLkV1i0@w#@(l

diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 33b352350c..b9f1aad78d 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -276,6 +276,10 @@
 #define OBJ_EVENT_GFX_VAR_E  (OBJ_EVENT_GFX_VARS + 0xE)
 #define OBJ_EVENT_GFX_VAR_F  (OBJ_EVENT_GFX_VARS + 0xF) // 255
 
+// If true, follower pokemon will bob up and down
+// during their idle & walking animations
+#define OW_MON_BOBBING  TRUE
+
 #define SHADOW_SIZE_S   0
 #define SHADOW_SIZE_M   1
 #define SHADOW_SIZE_L   2
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index de70311b25..4a0f4f3e58 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -4973,19 +4973,17 @@ bool8 MovementType_FollowPlayer_Shadow(struct ObjectEvent *objectEvent, struct S
 
 bool8 MovementType_FollowPlayer_Active(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    if (gPlayerAvatar.tileTransitionState == T_NOT_MOVING && !gObjectEvents[gPlayerAvatar.objectEventId].heldMovementActive ) { // do nothing if player is stationary
-        return FALSE;
-    } else if (!IsFollowerVisible()) {
-      if (objectEvent->invisible) { // Return to shadowing state
-        sprite->sTypeFuncId = 0;
-        return FALSE;
-      }
-      // Animate entering pokeball
-      ClearObjectEventMovement(objectEvent, sprite);
-      ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_ENTER_POKEBALL);
-      objectEvent->singleMovementActive = 1;
-      sprite->sTypeFuncId = 2; // movement action sets state to 0
-      return TRUE;
+    if (!IsFollowerVisible()) {
+        if (objectEvent->invisible) { // Return to shadowing state
+            sprite->sTypeFuncId = 0;
+            return FALSE;
+        }
+        // Animate entering pokeball
+        ClearObjectEventMovement(objectEvent, sprite);
+        ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_ENTER_POKEBALL);
+        objectEvent->singleMovementActive = 1;
+        sprite->sTypeFuncId = 2; // movement action sets state to 0
+        return TRUE;
     }
     // TODO: Remove dependence on PlayerGetCopyableMovement
     return gFollowPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), NULL);
@@ -5005,23 +5003,33 @@ bool8 MovementType_FollowPlayer_Moving(struct ObjectEvent *objectEvent, struct S
         if (sprite->sTypeFuncId) { // restore nonzero state
             sprite->sTypeFuncId = 1;
         }
-    } else if (objectEvent->movementActionId != MOVEMENT_ACTION_EXIT_POKEBALL) {
+    } else if (objectEvent->movementActionId < MOVEMENT_ACTION_EXIT_POKEBALL) {
         UpdateFollowerTransformEffect(objectEvent, sprite);
+        #if OW_MON_BOBBING == TRUE
+        if ((sprite->data[5] & 7) == 2)
+            sprite->y2 ^= -1;
+        #endif
     }
     return FALSE;
 }
 
 bool8 FollowablePlayerMovement_Idle(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
-    u8 direction;
-    if (!objectEvent->singleMovementActive) { // walk in place
+    if (!objectEvent->singleMovementActive)
+    { // walk in place
       ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection));
       sprite->sTypeFuncId = 1;
       objectEvent->singleMovementActive = 1;
       return TRUE;
-    } else if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { // finish movement action
+    }
+    else if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
+    { // finish movement action
         objectEvent->singleMovementActive = 0;
     }
+    #if OW_MON_BOBBING == TRUE
+    else if ((sprite->data[3] & 7) == 2)
+        sprite->y2 ^= -1;
+    #endif
     UpdateFollowerTransformEffect(objectEvent, sprite);
     return FALSE;
 }
@@ -5034,7 +5042,7 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri
     s16 targetX;
     s16 targetY;
     #ifdef MB_SIDEWAYS_STAIRS_RIGHT_SIDE
-    u8 playerAction = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId;
+    u32 playerAction = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId;
     #endif
 
     targetX = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x;
@@ -5059,6 +5067,9 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri
       ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_EXIT_POKEBALL);
       objectEvent->singleMovementActive = 1;
       sprite->sTypeFuncId = 2;
+      #if OW_MON_BOBBING == TRUE
+      sprite->y2 = 0;
+      #endif
       return TRUE;
     } else if (x == targetX && y == targetY) { // don't move if already in the player's last position
       return FALSE;
@@ -5082,8 +5093,12 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri
     } else {
         if (playerAction >= MOVEMENT_ACTION_WALK_SLOW_DOWN && playerAction <= MOVEMENT_ACTION_WALK_SLOW_RIGHT)
             ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkSlowMovementAction(direction));
-        else
+        else {
             objectEvent->movementActionId = GetWalkNormalMovementAction(direction);
+            #if OW_MON_BOBBING == TRUE
+            sprite->y2 = -1;
+            #endif
+        }
     }
     sprite->sActionFuncId = 0;
     #else
@@ -5094,8 +5109,12 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri
     // If *player* jumps, make step take twice as long
     else if (PlayerGetCopyableMovement() == COPY_MOVE_JUMP2)
         ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkSlowMovementAction(direction));
-    else
+    else {
         ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(direction));
+        #if OW_MON_BOBBING == TRUE
+        sprite->y2 = -1;
+        #endif
+    }
     #endif
     objectEvent->singleMovementActive = 1;
     sprite->sTypeFuncId = 2;