From d994975b3802e9d655ea9848319f2fe32c1a4e73 Mon Sep 17 00:00:00 2001
From: Espyo <andreluis.g.silva@gmail.com>
Date: Wed, 11 Dec 2024 15:17:22 +0000
Subject: [PATCH] Added Pikmin called animations.

---
 .../pikmin/blue_pikmin/animations.txt         |  25 ++--
 .../mob_types/pikmin/bulbmin/animations.txt   |  50 ++++++-
 .../pikmin/purple_pikmin/animations.txt       |  25 ++--
 .../pikmin/red_pikmin/animations.txt          |  25 ++--
 .../pikmin/rock_pikmin/animations.txt         |  25 ++--
 .../pikmin/white_pikmin/animations.txt        |  25 ++--
 .../pikmin/winged_pikmin/animations.txt       |  34 ++---
 .../pikmin/yellow_pikmin/animations.txt       |  25 ++--
 manual/content/changelog.html                 |   2 +-
 manual/content/mob_pikmin.html                |   2 +-
 source/documents/todo.txt                     |   3 +-
 source/source/mob_fsms/pikmin_fsm.cpp         | 127 ++++++++++++------
 source/source/mob_types/pikmin_type.cpp       |   2 +-
 source/source/mob_types/pikmin_type.h         |  12 +-
 14 files changed, 261 insertions(+), 121 deletions(-)

diff --git a/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt b/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt
index d17adb5d..3d0f4995 100644
--- a/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt
+++ b/game_data/base/mob_types/pikmin/blue_pikmin/animations.txt
@@ -71,6 +71,22 @@ animations{
 			}
 		}
 	}
+	called{
+		frames{
+			idling_01{
+				duration=0.0500
+				interpolate=true
+			}
+			idling_big{
+				duration=0.1000
+				interpolate=true
+			}
+			idling_01{
+				duration=0.2000
+				interpolate=true
+			}
+		}
+	}
 	carrying{
 		frames{
 			grabbing{
@@ -188,13 +204,6 @@ animations{
 			}
 		}
 	}
-	grabbing{
-		frames{
-			grabbing{
-				duration=0.0000
-			}
-		}
-	}
 	idling{
 		frames{
 			idling_01{
@@ -1398,7 +1407,7 @@ sprites{
 		file=blue_pikmin
 		file_pos=0.0000 0.0000
 		file_size=20.0000 20.0000
-		scale=0.5500 0.5500
+		scale=0.6500 0.6500
 		top_visible=true
 		top_pos=-5.0000 0.0000
 		top_size=5.5000 10.0000
diff --git a/game_data/base/mob_types/pikmin/bulbmin/animations.txt b/game_data/base/mob_types/pikmin/bulbmin/animations.txt
index ab2e96ec..85c284ab 100644
--- a/game_data/base/mob_types/pikmin/bulbmin/animations.txt
+++ b/game_data/base/mob_types/pikmin/bulbmin/animations.txt
@@ -71,6 +71,22 @@ animations{
 			}
 		}
 	}
+	called{
+		frames{
+			idling_01{
+				duration=0.0500
+				interpolate=true
+			}
+			idling_big{
+				duration=0.1000
+				interpolate=true
+			}
+			idling_01{
+				duration=0.2000
+				interpolate=true
+			}
+		}
+	}
 	carrying{
 		frames{
 			idling_01{
@@ -201,13 +217,6 @@ animations{
 			}
 		}
 	}
-	grabbing{
-		frames{
-			grabbing{
-				duration=0.0000
-			}
-		}
-	}
 	idling{
 		frames{
 			idling_01{
@@ -1332,6 +1341,33 @@ sprites{
 			}
 		}
 	}
+	idling_big{
+		file=bulbmin
+		file_pos=0.0000 0.0000
+		file_size=34.0000 28.0000
+		offset=2.0000 0.0000
+		scale=0.6500 0.6500
+		top_visible=true
+		top_pos=-5.0000 0.0000
+		top_size=5.5000 10.0000
+		top_angle=0.0000
+		hitboxes{
+			top{
+				coords=-4.0000 0.0000 0.0000
+				height=24.0000
+				radius=4.0000
+				type=2
+				value=1.0000
+			}
+			body{
+				coords=0.0000 0.0000 0.0000
+				height=24.0000
+				radius=7.0000
+				type=0
+				value=1.0000
+			}
+		}
+	}
 	idling_rev{
 		file=bulbmin
 		file_pos=0.0000 0.0000
diff --git a/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt b/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt
index b5780068..9144323b 100644
--- a/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt
+++ b/game_data/base/mob_types/pikmin/purple_pikmin/animations.txt
@@ -71,6 +71,22 @@ animations{
 			}
 		}
 	}
+	called{
+		frames{
+			idling_01{
+				duration=0.0500
+				interpolate=true
+			}
+			idling_big{
+				duration=0.1000
+				interpolate=true
+			}
+			idling_01{
+				duration=0.2000
+				interpolate=true
+			}
+		}
+	}
 	carrying{
 		frames{
 			grabbing{
@@ -188,13 +204,6 @@ animations{
 			}
 		}
 	}
-	grabbing{
-		frames{
-			grabbing{
-				duration=0.0000
-			}
-		}
-	}
 	idling{
 		frames{
 			idling_01{
@@ -1398,7 +1407,7 @@ sprites{
 		file=purple_pikmin
 		file_pos=0.0000 0.0000
 		file_size=24.0000 36.0000
-		scale=0.5500 0.5500
+		scale=0.6500 0.6500
 		top_visible=true
 		top_pos=-5.0000 0.0000
 		top_size=5.5000 10.0000
diff --git a/game_data/base/mob_types/pikmin/red_pikmin/animations.txt b/game_data/base/mob_types/pikmin/red_pikmin/animations.txt
index 98c86667..8b0092b5 100644
--- a/game_data/base/mob_types/pikmin/red_pikmin/animations.txt
+++ b/game_data/base/mob_types/pikmin/red_pikmin/animations.txt
@@ -71,6 +71,22 @@ animations{
 			}
 		}
 	}
+	called{
+		frames{
+			idling_01{
+				duration=0.0500
+				interpolate=true
+			}
+			idling_big{
+				duration=0.1000
+				interpolate=true
+			}
+			idling_01{
+				duration=0.2000
+				interpolate=true
+			}
+		}
+	}
 	carrying{
 		frames{
 			grabbing{
@@ -188,13 +204,6 @@ animations{
 			}
 		}
 	}
-	grabbing{
-		frames{
-			grabbing{
-				duration=0.0000
-			}
-		}
-	}
 	idling{
 		frames{
 			idling_01{
@@ -1403,7 +1412,7 @@ sprites{
 		file_pos=0.0000 0.0000
 		file_size=28.0000 20.0000
 		offset=2.0000 0.0000
-		scale=0.5500 0.5500
+		scale=0.6500 0.6500
 		top_visible=true
 		top_pos=-5.0000 0.0000
 		top_size=5.5000 10.0000
diff --git a/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt b/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt
index 36270b68..c47b1bc5 100644
--- a/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt
+++ b/game_data/base/mob_types/pikmin/rock_pikmin/animations.txt
@@ -56,6 +56,22 @@ animations{
 			}
 		}
 	}
+	called{
+		frames{
+			idling_01{
+				duration=0.0500
+				interpolate=true
+			}
+			idling_big{
+				duration=0.1000
+				interpolate=true
+			}
+			idling_01{
+				duration=0.2000
+				interpolate=true
+			}
+		}
+	}
 	carrying{
 		frames{
 			grabbing{
@@ -167,13 +183,6 @@ animations{
 			}
 		}
 	}
-	grabbing{
-		frames{
-			grabbing{
-				duration=0.0000
-			}
-		}
-	}
 	idling{
 		frames{
 			idling_01{
@@ -1168,7 +1177,7 @@ sprites{
 		file=rock_pikmin
 		file_pos=0.0000 0.0000
 		file_size=28.0000 28.0000
-		scale=0.5500 0.5500
+		scale=0.6500 0.6500
 		top_visible=true
 		top_pos=-5.0000 0.0000
 		top_size=5.5000 10.0000
diff --git a/game_data/base/mob_types/pikmin/white_pikmin/animations.txt b/game_data/base/mob_types/pikmin/white_pikmin/animations.txt
index c31b47c5..72a8d4a7 100644
--- a/game_data/base/mob_types/pikmin/white_pikmin/animations.txt
+++ b/game_data/base/mob_types/pikmin/white_pikmin/animations.txt
@@ -71,6 +71,22 @@ animations{
 			}
 		}
 	}
+	called{
+		frames{
+			idling_01{
+				duration=0.0500
+				interpolate=true
+			}
+			idling_big{
+				duration=0.1000
+				interpolate=true
+			}
+			idling_01{
+				duration=0.2000
+				interpolate=true
+			}
+		}
+	}
 	carrying{
 		frames{
 			grabbing{
@@ -188,13 +204,6 @@ animations{
 			}
 		}
 	}
-	grabbing{
-		frames{
-			grabbing{
-				duration=0.0000
-			}
-		}
-	}
 	idling{
 		frames{
 			idling_01{
@@ -1398,7 +1407,7 @@ sprites{
 		file=white_pikmin
 		file_pos=0.0000 0.0000
 		file_size=16.0000 16.0000
-		scale=0.5500 0.5500
+		scale=0.6500 0.6500
 		top_visible=true
 		top_pos=-5.0000 0.0000
 		top_size=5.5000 10.0000
diff --git a/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt b/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt
index d38d2a20..29409d98 100644
--- a/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt
+++ b/game_data/base/mob_types/pikmin/winged_pikmin/animations.txt
@@ -71,6 +71,22 @@ animations{
 			}
 		}
 	}
+	called{
+		frames{
+			idling_01{
+				duration=0.0500
+				interpolate=true
+			}
+			idling_big{
+				duration=0.1000
+				interpolate=true
+			}
+			idling_01{
+				duration=0.2000
+				interpolate=true
+			}
+		}
+	}
 	carrying{
 		frames{
 			grabbing_01{
@@ -188,22 +204,6 @@ animations{
 			}
 		}
 	}
-	grabbing{
-		frames{
-			grabbing_01{
-				duration=0.0500
-			}
-			grabbing_02{
-				duration=0.0500
-			}
-			grabbing_01{
-				duration=0.0500
-			}
-			grabbing_03{
-				duration=0.0500
-			}
-		}
-	}
 	idling{
 		frames{
 			idling_01{
@@ -1352,7 +1352,7 @@ sprites{
 		file_pos=0.0000 0.0000
 		file_size=30.0000 28.0000
 		offset=-2.5000 0.0000
-		scale=0.5500 0.5500
+		scale=0.6500 0.6500
 		top_visible=true
 		top_pos=-5.0000 0.0000
 		top_size=5.5000 10.0000
diff --git a/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt b/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt
index eb04e6d7..01eea15c 100644
--- a/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt
+++ b/game_data/base/mob_types/pikmin/yellow_pikmin/animations.txt
@@ -71,6 +71,22 @@ animations{
 			}
 		}
 	}
+	called{
+		frames{
+			idling_01{
+				duration=0.0500
+				interpolate=true
+			}
+			idling_big{
+				duration=0.1000
+				interpolate=true
+			}
+			idling_01{
+				duration=0.2000
+				interpolate=true
+			}
+		}
+	}
 	carrying{
 		frames{
 			grabbing{
@@ -188,13 +204,6 @@ animations{
 			}
 		}
 	}
-	grabbing{
-		frames{
-			grabbing{
-				duration=0.0000
-			}
-		}
-	}
 	idling{
 		frames{
 			idling_01{
@@ -1318,7 +1327,7 @@ sprites{
 		file=yellow_pikmin
 		file_pos=0.0000 0.0000
 		file_size=20.0000 36.0000
-		scale=0.5500 0.5500
+		scale=0.6500 0.6500
 		top_visible=true
 		top_pos=-5.0000 0.0000
 		top_size=5.5000 10.0000
diff --git a/manual/content/changelog.html b/manual/content/changelog.html
index 6aa1c8ce..a657d604 100644
--- a/manual/content/changelog.html
+++ b/manual/content/changelog.html
@@ -29,7 +29,7 @@ <h2 id="0.26.0">0.26.0</h2>
     <ul>
       <li><span class="cl-a">Added</span> some songs.</li>
       <li><span class="cl-a">Added</span> many new sounds.</li>
-      <li><span class="cl-a">Added</span> arms out, backflip, boredom, crushed, flailing, plucking thrown, shaking, and twirling animations to <a href="mob_pikmin.html">Pikmin</a>.</li>
+      <li><span class="cl-a">Added</span> arms out, backflip, boredom, called, crushed, flailing, plucking thrown, shaking, and twirling animations to <a href="mob_pikmin.html">Pikmin</a>.</li>
       <li><span class="cl-a">Added</span> throwing animations to <a href="mob_leader.html">leaders</a>.</li>
       <li><span class="cl-a">Added</span> Pikmin generation animations to <a href="mob_onion.html">Onions</a>.</li>
       <li><span class="cl-a">Added</span> a new <a href="area.html">area</a>: Olympian Ruins.</li>
diff --git a/manual/content/mob_pikmin.html b/manual/content/mob_pikmin.html
index 05833b4d..ebc5f456 100644
--- a/manual/content/mob_pikmin.html
+++ b/manual/content/mob_pikmin.html
@@ -158,12 +158,12 @@ <h2 id="animations">Animations</h2>
       <li><b><code>arms_out</code></b>: Standing still with arms stretched out sideways.</li>
       <li><b><code>attacking</code></b>: If its attack method is "latch", this is the Pikmin reeling back its head and smacking with it, causing damage; this is used regardless of the Pikmin being latched on or attacking while grounded. If its attack method is "impact", this is the Pikmin lunging forward and causing damage; it should be quick and snappy so the Pikmin can be bounced back shortly after.</li>
       <li><b><code>backflip</code></b>: Performing a single backflip to celebrate.</li>
+      <li><b><code>called</code></b>: Jumping up after being called by a leader.</li>
       <li><b><code>carrying</code></b>: Carrying an object.</li>
       <li><b><code>crushed</code></b>: Flattened after being crushed, and shrinking to die.</li>
       <li><b><code>drinking</code></b>: Bending down to drink a drop.</li>
       <li><b><code>flailing</code></b>: Flailing around, either because it's trying to wade out of water or because it got caught by an enemy.</li>
       <li><b><code>getting_up</code></b>: Getting up from lying down.</li>
-      <li><b><code>grabbing</code></b>: Standing upright and grabbing onto an object.</li>
       <li><b><code>knocked_back</code></b>: Getting knocked backwards, flying in the air.</li>
       <li><b><code>lying</code></b>: On the ground due to having been knocked down by an attack.</li>
       <li><b><code>mob_landing</code></b>: Getting ready to strike after landing on an object and latching on. Alternatively, causing damage after landing on an object.</li>
diff --git a/source/documents/todo.txt b/source/documents/todo.txt
index be710ffe..a48d45d6 100644
--- a/source/documents/todo.txt
+++ b/source/documents/todo.txt
@@ -37,7 +37,7 @@ Next tasks (roughly sorted most important first)
             It should also show and/or explain in some way how there's the base content
         When enabling, disabling, or re-ordering, a notification should appear saying how the game may need to be restarted
         There should be a button to open the packs folder
-    Update to Dear ImGui 1.91.5
+    Update to Dear ImGui 1.91.6
         Implement shortcuts?
         Use multi-selection in the body part panel of the animation editor?
         GetWindowContentRegionMax().x + GetWindowPos().x --> GetCursorScreenPos().x + GetContentRegionAvail().x
@@ -146,7 +146,6 @@ Next tasks (roughly sorted most important first)
             Sprout animations should start with nothingness, and grow into a sprout proper (as if popping out of the ground) (Helodity's made some)
                 If necessary, seeds should have their own animation
         New animations
-            Called to attention
             Climbing (add the track logic too)
             Pushing (add the group task logic too)
             Dying? (like shrinking or something)
diff --git a/source/source/mob_fsms/pikmin_fsm.cpp b/source/source/mob_fsms/pikmin_fsm.cpp
index 1badf031..19afc5eb 100644
--- a/source/source/mob_fsms/pikmin_fsm.cpp
+++ b/source/source/mob_fsms/pikmin_fsm.cpp
@@ -451,8 +451,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
         "going_to_dismiss_spot", PIKMIN_STATE_GOING_TO_DISMISS_SPOT
     ); {
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_ON_ENTER); {
             efc.run(pikmin_fsm::going_to_dismiss_spot);
@@ -539,8 +538,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.change_state("riding_track");
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_TOUCHED_ACTIVE_LEADER); {
             efc.run(pikmin_fsm::check_leader_bump);
@@ -582,13 +580,42 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
         }
     }
     
+    efc.new_state("called", PIKMIN_STATE_CALLED); {
+        efc.new_event(MOB_EV_ON_ENTER); {
+            efc.run(pikmin_fsm::called);
+        }
+        efc.new_event(MOB_EV_ANIMATION_END); {
+            efc.change_state("in_group_chasing");
+        }
+        efc.new_event(MOB_EV_HITBOX_TOUCH_N_A); {
+            efc.run(pikmin_fsm::check_incoming_attack);
+        }
+        efc.new_event(MOB_EV_PIKMIN_DAMAGE_CONFIRMED); {
+            efc.change_state("knocked_back");
+        }
+        efc.new_event(MOB_EV_HITBOX_TOUCH_EAT); {
+            efc.run(pikmin_fsm::touched_eat_hitbox);
+        }
+        efc.new_event(MOB_EV_TOUCHED_HAZARD); {
+            efc.run(pikmin_fsm::touched_hazard);
+        }
+        efc.new_event(MOB_EV_LEFT_HAZARD); {
+            efc.run(pikmin_fsm::left_hazard);
+        }
+        efc.new_event(MOB_EV_TOUCHED_SPRAY); {
+            efc.run(pikmin_fsm::touched_spray);
+        }
+        efc.new_event(MOB_EV_BOTTOMLESS_PIT); {
+            efc.run(pikmin_fsm::fall_down_pit);
+        }
+    }
+    
     efc.new_state("going_to_opponent", PIKMIN_STATE_GOING_TO_OPPONENT); {
         efc.new_event(MOB_EV_REACHED_DESTINATION); {
             efc.run(pikmin_fsm::decide_attack);
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_FOCUS_OFF_REACH); {
             efc.change_state("idling");
@@ -627,8 +654,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.run(pikmin_fsm::decide_attack);
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_FOCUS_OFF_REACH); {
             efc.change_state("idling");
@@ -679,8 +705,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
         }
         efc.new_event(MOB_EV_WHISTLED); {
             efc.run(pikmin_fsm::forget_carriable_object);
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_HITBOX_TOUCH_N_A); {
             efc.run(pikmin_fsm::check_incoming_attack);
@@ -720,8 +745,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
         }
         efc.new_event(MOB_EV_WHISTLED); {
             efc.run(pikmin_fsm::forget_tool);
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_HITBOX_TOUCH_N_A); {
             efc.run(pikmin_fsm::check_incoming_attack);
@@ -761,8 +785,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
         }
         efc.new_event(MOB_EV_WHISTLED); {
             efc.run(pikmin_fsm::forget_group_task);
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_FOCUSED_MOB_UNAVAILABLE); {
             efc.run(pikmin_fsm::forget_group_task);
@@ -804,8 +827,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.change_state("entering_onion");
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_HITBOX_TOUCH_N_A); {
             efc.run(pikmin_fsm::check_incoming_attack);
@@ -839,8 +861,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.change_state("idling");
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_TOUCHED_ACTIVE_LEADER); {
             efc.run(pikmin_fsm::check_leader_bump);
@@ -871,8 +892,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.run(pikmin_fsm::stand_still);
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_FINISHED_CARRYING); {
             efc.run(pikmin_fsm::finish_carrying);
@@ -924,8 +944,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.run(pikmin_fsm::forget_group_task);
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_FOCUSED_MOB_UNAVAILABLE); {
             efc.run(pikmin_fsm::forget_group_task);
@@ -962,8 +981,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.run(pikmin_fsm::stand_still);
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_REACHED_DESTINATION); {
             efc.change_state("idling");
@@ -1002,8 +1020,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.run(pikmin_fsm::rechase_opponent);
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_HITBOX_TOUCH_N_A); {
             efc.run(pikmin_fsm::check_incoming_attack);
@@ -1036,8 +1053,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.run(pikmin_fsm::unlatch);
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_FOCUS_DIED); {
             efc.run(pikmin_fsm::lose_latched_mob);
@@ -1332,8 +1348,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
             efc.change_state("idling");
         }
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing");
+            efc.change_state("called");
         }
         efc.new_event(MOB_EV_TOUCHED_ACTIVE_LEADER); {
             efc.run(pikmin_fsm::check_leader_bump);
@@ -1650,8 +1665,7 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
         "going_to_dismiss_spot_h", PIKMIN_STATE_GOING_TO_DISMISS_SPOT_H
     ); {
         efc.new_event(MOB_EV_WHISTLED); {
-            efc.run(pikmin_fsm::called);
-            efc.change_state("in_group_chasing_h");
+            efc.change_state("called_h");
         }
         efc.new_event(MOB_EV_RELEASE_ORDER); {
             efc.run(pikmin_fsm::release_tool);
@@ -1737,6 +1751,36 @@ void pikmin_fsm::create_fsm(mob_type* typ) {
         }
     }
     
+    efc.new_state("called_h", PIKMIN_STATE_CALLED_H); {
+        efc.new_event(MOB_EV_ON_ENTER); {
+            efc.run(pikmin_fsm::called);
+        }
+        efc.new_event(MOB_EV_ANIMATION_END); {
+            efc.change_state("in_group_chasing_h");
+        }
+        efc.new_event(MOB_EV_HITBOX_TOUCH_N_A); {
+            efc.run(pikmin_fsm::check_incoming_attack);
+        }
+        efc.new_event(MOB_EV_PIKMIN_DAMAGE_CONFIRMED); {
+            efc.change_state("knocked_back");
+        }
+        efc.new_event(MOB_EV_HITBOX_TOUCH_EAT); {
+            efc.run(pikmin_fsm::touched_eat_hitbox);
+        }
+        efc.new_event(MOB_EV_TOUCHED_HAZARD); {
+            efc.run(pikmin_fsm::touched_hazard);
+        }
+        efc.new_event(MOB_EV_LEFT_HAZARD); {
+            efc.run(pikmin_fsm::left_hazard);
+        }
+        efc.new_event(MOB_EV_TOUCHED_SPRAY); {
+            efc.run(pikmin_fsm::touched_spray);
+        }
+        efc.new_event(MOB_EV_BOTTOMLESS_PIT); {
+            efc.run(pikmin_fsm::fall_down_pit);
+        }
+    }
+    
     efc.new_state("riding_track", PIKMIN_STATE_RIDING_TRACK); {
         efc.new_event(MOB_EV_ON_ENTER); {
             efc.run(pikmin_fsm::start_riding_track);
@@ -2130,10 +2174,11 @@ void pikmin_fsm::called(mob* m, void* info1, void* info2) {
     
     pik_ptr->was_last_hit_dud = false;
     pik_ptr->consecutive_dud_hits = 0;
-    pik_ptr->stop_circling();
+    pikmin_fsm::stand_still(m, info1, info2);
     
     caller->add_to_group(pik_ptr);
     
+    pik_ptr->set_animation(PIKMIN_ANIM_CALLED);
     if(info2 == nullptr) {
         m->play_sound(pik_ptr->pik_type->sound_data_idxs[PIKMIN_SOUND_CALLED]);
     }
@@ -2261,9 +2306,9 @@ void pikmin_fsm::check_leader_bump(mob* m, void* info1, void* info2) {
         !pik_ptr->holding.empty() &&
         pik_ptr->holding[0]->type->category->id == MOB_CATEGORY_TOOLS
     ) {
-        m->fsm.set_state(PIKMIN_STATE_IN_GROUP_CHASING_H);
+        m->fsm.set_state(PIKMIN_STATE_CALLED_H, info1, info2);
     } else {
-        m->fsm.set_state(PIKMIN_STATE_IN_GROUP_CHASING);
+        m->fsm.set_state(PIKMIN_STATE_CALLED, info1, info2);
     }
 }
 
@@ -4170,9 +4215,9 @@ void pikmin_fsm::tick_track_ride(mob* m, void* info1, void* info2) {
                 !pik_ptr->holding.empty() &&
                 pik_ptr->holding[0]->type->category->id == MOB_CATEGORY_TOOLS
             ) {
-                m->fsm.set_state(PIKMIN_STATE_IN_GROUP_CHASING_H);
+                m->fsm.set_state(PIKMIN_STATE_CALLED_H, info1, info2);
             } else {
-                m->fsm.set_state(PIKMIN_STATE_IN_GROUP_CHASING);
+                m->fsm.set_state(PIKMIN_STATE_CALLED, info1, info2);
             }
         }
     }
@@ -4397,9 +4442,9 @@ void pikmin_fsm::whistled_while_holding(mob* m, void* info1, void* info2) {
         !pik_ptr->holding.empty() &&
         pik_ptr->holding[0]->type->category->id == MOB_CATEGORY_TOOLS
     ) {
-        m->fsm.set_state(PIKMIN_STATE_IN_GROUP_CHASING_H);
+        m->fsm.set_state(PIKMIN_STATE_CALLED_H, info1, info2);
     } else {
-        m->fsm.set_state(PIKMIN_STATE_IN_GROUP_CHASING);
+        m->fsm.set_state(PIKMIN_STATE_CALLED, info1, info2);
     }
     
 }
@@ -4425,9 +4470,9 @@ void pikmin_fsm::whistled_while_riding(mob* m, void* info1, void* info2) {
             !pik_ptr->holding.empty() &&
             pik_ptr->holding[0]->type->category->id == MOB_CATEGORY_TOOLS
         ) {
-            m->fsm.set_state(PIKMIN_STATE_IN_GROUP_CHASING_H);
+            m->fsm.set_state(PIKMIN_STATE_CALLED_H, info1, info2);
         } else {
-            m->fsm.set_state(PIKMIN_STATE_IN_GROUP_CHASING);
+            m->fsm.set_state(PIKMIN_STATE_CALLED, info1, info2);
         }
     }
 }
diff --git a/source/source/mob_types/pikmin_type.cpp b/source/source/mob_types/pikmin_type.cpp
index 18845acb..7b714652 100644
--- a/source/source/mob_types/pikmin_type.cpp
+++ b/source/source/mob_types/pikmin_type.cpp
@@ -127,11 +127,11 @@ pikmin_type::pikmin_type() :
 anim_conversion_vector pikmin_type::get_anim_conversions() const {
     anim_conversion_vector v;
     v.push_back(std::make_pair(PIKMIN_ANIM_IDLING,          "idling"));
+    v.push_back(std::make_pair(PIKMIN_ANIM_CALLED,          "called"));
     v.push_back(std::make_pair(PIKMIN_ANIM_WALKING,         "walking"));
     v.push_back(std::make_pair(PIKMIN_ANIM_THROWN,          "thrown"));
     v.push_back(std::make_pair(PIKMIN_ANIM_MOB_LANDING,     "mob_landing"));
     v.push_back(std::make_pair(PIKMIN_ANIM_ATTACKING,       "attacking"));
-    v.push_back(std::make_pair(PIKMIN_ANIM_GRABBING,        "grabbing"));
     v.push_back(std::make_pair(PIKMIN_ANIM_BACKFLIP,        "backflip"));
     v.push_back(std::make_pair(PIKMIN_ANIM_TWIRLING,        "twirling"));
     v.push_back(std::make_pair(PIKMIN_ANIM_SIGHING,         "sighing"));
diff --git a/source/source/mob_types/pikmin_type.h b/source/source/mob_types/pikmin_type.h
index af0efc9f..df91e5a7 100644
--- a/source/source/mob_types/pikmin_type.h
+++ b/source/source/mob_types/pikmin_type.h
@@ -44,6 +44,9 @@ enum PIKMIN_STATE {
     //Idling.
     PIKMIN_STATE_IDLING,
     
+    //Called.
+    PIKMIN_STATE_CALLED,
+    
     //As a seed.
     PIKMIN_STATE_SEED,
     
@@ -164,6 +167,9 @@ enum PIKMIN_STATE {
     //Idling, whilst holding a tool.
     PIKMIN_STATE_IDLING_H,
     
+    //Called, whilst holding a tool.
+    PIKMIN_STATE_CALLED_H,
+    
     //Grabbed by a leader, whilst holding a tool.
     PIKMIN_STATE_GRABBED_BY_LEADER_H,
     
@@ -188,6 +194,9 @@ enum PIKMIN_ANIM {
     //Idling.
     PIKMIN_ANIM_IDLING,
     
+    //Called.
+    PIKMIN_ANIM_CALLED,
+    
     //Walking.
     PIKMIN_ANIM_WALKING,
     
@@ -200,9 +209,6 @@ enum PIKMIN_ANIM {
     //Attacking.
     PIKMIN_ANIM_ATTACKING,
     
-    //Grabbing.
-    PIKMIN_ANIM_GRABBING,
-    
     //Carrying.
     PIKMIN_ANIM_CARRYING,