From 668cd7e413fb713b68207e4c261d5a40eaca7bbf Mon Sep 17 00:00:00 2001
From: Bivurnum <147376167+Bivurnum@users.noreply.github.com>
Date: Fri, 2 May 2025 14:08:42 -0500
Subject: [PATCH] Rename follower npc macros for better specificity and to
 match documentation (#6742)

---
 asm/macros/event.inc             | 10 +++++-----
 include/constants/follower_npc.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index e118d787d8..01d7bd53f6 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -2525,8 +2525,8 @@
 	@ Sets an NPC up to follow the player.
 	@ Follower flags are defined in include/constants/follower_npc.h
 	@ If you want to specify a battle partner without specifying a custom script, you can set the script parameter to 0.
-	.macro setfollower localId:req, flags:req, script=0, battlePartner=0
-	checkfollower
+	.macro setfollowernpc localId:req, flags:req, script=0, battlePartner=0
+	checkfollowernpc
 	goto_if_eq VAR_RESULT, TRUE, 1f
 	hidefollower
 	delay 16
@@ -2546,12 +2546,12 @@
 	.endm
 
 	@ Remove the follower NPC (assumes there will only ever be one).
-	.macro destroyfollower
+	.macro destroyfollowernpc
 	callnative ScriptDestroyFollowerNPC
 	.endm
 
 	@ Makes the player and follower NPC face one another.
-	.macro facefollower
+	.macro facefollowernpc
 	callnative ScriptFaceFollowerNPC
 	.endm
 
@@ -2569,7 +2569,7 @@
 	.endm
 
 	@ Checks if you have a follower NPC. Returns the result to VAR_RESULT.
-	.macro checkfollower
+	.macro checkfollowernpc
 	callnative ScriptCheckFollowerNPC
 	.endm
 
diff --git a/include/constants/follower_npc.h b/include/constants/follower_npc.h
index 9c41cb0895..e1c84b05a4 100644
--- a/include/constants/follower_npc.h
+++ b/include/constants/follower_npc.h
@@ -14,7 +14,7 @@
 #define FOLLOWER_NPC_FLAG_ALL_WATER             FOLLOWER_NPC_FLAG_CAN_SURF | FOLLOWER_NPC_FLAG_CAN_WATERFALL | FOLLOWER_NPC_FLAG_CAN_DIVE
 #define FOLLOWER_NPC_FLAG_ALL                   FOLLOWER_NPC_FLAG_ALL_LAND | FOLLOWER_NPC_FLAG_ALL_WATER | FOLLOWER_NPC_FLAG_CLEAR_ON_WHITE_OUT
 
-// Shorter flag names for ease of use in setfollower script macro
+// Shorter flag names for ease of use in setfollowernpc script macro
 #define FNPC_RUNNING                          FOLLOWER_NPC_FLAG_HAS_RUNNING_FRAMES
 #define FNPC_BIKE                             FOLLOWER_NPC_FLAG_CAN_BIKE
 #define FNPC_LEAVE_ROUTE                      FOLLOWER_NPC_FLAG_CAN_LEAVE_ROUTE