From b5c8b0f494dd9d92ef0dadcffa5bbf847335cbee Mon Sep 17 00:00:00 2001
From: Ariel Antonitis <arant@mit.edu>
Date: Fri, 26 Jun 2020 00:30:01 -0400
Subject: [PATCH] Added more follower messages.

---
 data/scripts/follower.inc   | 22 +++++++++++++++++++++-
 include/event_scripts.h     |  2 ++
 src/event_object_movement.c |  8 ++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/data/scripts/follower.inc b/data/scripts/follower.inc
index f071ed93be..2c9a6315de 100644
--- a/data/scripts/follower.inc
+++ b/data/scripts/follower.inc
@@ -1,5 +1,5 @@
 gText_FollowerLovesYou::
-  .string "{STR_VAR_1} loves you!$"
+  .string "{STR_VAR_1} jumps and grins at you.\pIts expression is welling up with love!$"
 
 gText_FollowerLostInThought::
   .string "{STR_VAR_1} seems lost in thought.$"
@@ -28,6 +28,12 @@ gText_FollowerMetLocation::
 gText_FollowerSkeptical::
   .string "{STR_VAR_1} gives you a skeptical look...\pWhat could it mean?$"
 
+gText_FollowerAppraising::
+  .string "{STR_VAR_1} looks you up and down...\pIt carefully follows\nbehind you.$"
+
+gText_FollowerHappyWalk::
+  .string "{STR_VAR_1} skips happily behind you!$"
+
 .macro playfirstmoncry
 callfunc ScrFunc_playfirstmoncry
 .endm
@@ -56,6 +62,20 @@ EventScript_FollowerEnd::
   release
   end
 
+EventScript_FollowerHappyWalk::
+  bufferlivemonspeciesname 0
+  playfirstmoncry
+  msgbox gText_FollowerHappyWalk, MSGBOX_DEFAULT
+  waitmoncry
+  return
+
+EventScript_FollowerAppraising::
+  bufferlivemonspeciesname 0
+  playfirstmoncry
+  msgbox gText_FollowerAppraising, MSGBOX_DEFAULT
+  waitmoncry
+  return
+
 EventScript_FollowerSkeptical::
   bufferlivemonspeciesname 0
   playfirstmoncry
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 66b481b922..714a8ffc59 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -10,6 +10,8 @@ extern const u8 EventScript_FollowerHappyRain[];
 extern const u8 EventScript_FollowerMetLocation[];
 extern const u8 EventScript_FollowerEnd[];
 extern const u8 EventScript_FollowerSkeptical[];
+extern const u8 EventScript_FollowerAppraising[];
+extern const u8 EventScript_FollowerHappyWalk[];
 extern const u8 EnterPokeballMovement[];
 
 extern const u8 EventScript_TestSignpostMsg[];
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index a9726ce17e..15850aa1bc 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1737,9 +1737,13 @@ bool8 ScrFunc_getfolloweraction(struct ScriptContext *ctx) // Essentially a big
     return FALSE;
   }
   friendship = GetMonData(mon, MON_DATA_FRIENDSHIP);
-  if (friendship < 25)
+  if (friendship <= 80)
     ScriptCall(ctx, EventScript_FollowerSkeptical);
-  else if (friendship == 255)
+  else if (friendship <= 170)
+    ScriptCall(ctx, EventScript_FollowerAppraising);
+  else if (friendship < 255)
+    ScriptCall(ctx, EventScript_FollowerHappyWalk);
+  else // Max friendship
     ScriptCall(ctx, EventScript_FollowerLovesYou);
   return FALSE;
 }