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

Using follower's nickname instead of ther species name.

Browse Source
This commit is contained in:
Eduardo Quezada 2022-05-13 21:03:03 -04:00 committed by Ariel A
parent f623406731
commit 21d8c8e9c5
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/scripts/follower.inc
View File

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

7
src/scrcmd.c
View File

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