From 21d8c8e9c5059507767d0ca5c130795e82cb4f04 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 13 May 2022 21:03:03 -0400 Subject: [PATCH] Using follower's nickname instead of ther species name. --- data/scripts/follower.inc | 8 ++++---- src/scrcmd.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/data/scripts/follower.inc b/data/scripts/follower.inc index 3e9dc45e69..a8303e5ba3 100644 --- a/data/scripts/follower.inc +++ b/data/scripts/follower.inc @@ -14,8 +14,8 @@ gText_WantsToFly:: callfunc ScrFunc_playfirstmoncry .endm -.macro bufferlivemonspeciesname out:req -callfunc ScrFunc_bufferlivemonspeciesname +.macro bufferlivemonnickname out:req +callfunc ScrFunc_bufferlivemonnickname .byte \out .endm @@ -27,13 +27,13 @@ callfunc ScrFunc_emote EventScript_Follower:: lock - bufferlivemonspeciesname 0 + bufferlivemonnickname 0 playfirstmoncry callfunc ScrFunc_getfolloweraction checkpartymove MOVE_FLY compare VAR_RESULT 6 goto_if_eq EventScript_FollowerEnd - bufferlivemonspeciesname 0 + bufferlivemonnickname 0 msgbox gText_WantsToFly, MSGBOX_YESNO switch VAR_RESULT case NO, EventScript_FollowerEnd diff --git a/src/scrcmd.c b/src/scrcmd.c index b53ae95b90..2461b0d960 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1606,13 +1606,12 @@ bool8 ScrCmd_bufferleadmonspeciesname(struct ScriptContext *ctx) return FALSE; } -bool8 ScrFunc_bufferlivemonspeciesname(struct ScriptContext *ctx) +bool8 ScrFunc_bufferlivemonnickname(struct ScriptContext *ctx) { u8 stringVarIndex = ScriptReadByte(ctx); - u8 *dest = sScriptStringVars[stringVarIndex]; - u32 species = GetMonData(GetFirstLiveMon(), MON_DATA_SPECIES); - StringCopy(dest, gSpeciesNames[species]); + GetMonData(GetFirstLiveMon(), MON_DATA_NICKNAME, sScriptStringVars[stringVarIndex]); + StringGet_Nickname(sScriptStringVars[stringVarIndex]); return FALSE; }