Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Bugfix hidefollower not waiting properly (#7768)
Some checks are pending
CI / build (push) Waiting to run
Details
CI / allcontributors (push) Waiting to run
Details
Docs / deploy (push) Waiting to run
Details

Browse Source
This commit is contained in:
FosterProgramming 2025-10-19 16:39:07 +02:00 committed by GitHub
parent 5b2ecfe4d4
commit 4816fe02c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/event.inc
View File

@ -2482,7 +2482,7 @@
@ Hides any follower Pokémon if present, putting them into their Poké Ball; by default waits for their movement to finish.
.macro hidefollower wait=1
callnative ScrFunc_hidefollower
.byte SCR_OP_HIDEFOLLOWER
.2byte \wait
.endm

1
data/script_cmd_table.inc
View File

@ -251,6 +251,7 @@ gScriptCmdTable::
script_cmd_table_entry SCR_OP_BUFFERITEMNAMEPLURAL ScrCmd_bufferitemnameplural, requests_effects=1 @ 0xe2
script_cmd_table_entry SCR_OP_DYNMULTICHOICE ScrCmd_dynmultichoice, requests_effects=1 @ 0xe3
script_cmd_table_entry SCR_OP_DYNMULTIPUSH ScrCmd_dynmultipush, requests_effects=1 @ 0xe4
script_cmd_table_entry SCR_OP_HIDEFOLLOWER ScrCmd_hidefollower, requests_effects=1 @ 0xe5
.if ALLOCATE_SCRIPT_CMD_TABLE
gScriptCmdTableEnd::

4
src/scrcmd.c
View File

@ -3154,11 +3154,13 @@ bool8 Scrcmd_getobjectfacingdirection(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrFunc_hidefollower(struct ScriptContext *ctx)
bool8 ScrCmd_hidefollower(struct ScriptContext *ctx)
{
bool16 wait = VarGet(ScriptReadHalfword(ctx));
struct ObjectEvent *obj;
Script_RequestEffects(SCREFF_V1 | SCREFF_HARDWARE);
if ((obj = ScriptHideFollower()) != NULL && wait)
{
sMovingNpcId = obj->localId;