Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename follower npc macros for better specificity and to match documentation (#6742)

Browse Source
This commit is contained in:
Bivurnum 2025-05-02 14:08:42 -05:00 committed by GitHub
parent ccda2308a3
commit 668cd7e413
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asm/macros/event.inc
View File

@ -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

2
include/constants/follower_npc.h
View File

@ -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