atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set VAR_RESULT to the number of removed items from removeallitem per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531

Browse source
This commit is contained in:
pkmnsnfrn 2024-09-12 05:47:12 -07:00
parent f87440a25a
commit 979c9994f7
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.swo
View file

Binary file not shown.

2
asm/macros/event.inc
View file

@ -2339,7 +2339,7 @@
callnative ScriptHideItemDescription
.endm
@ Remove all of specified item from the player's bag
@ Remove all of specified item from the player's bag and return the number of removed items to VAR_RESULT
.macro removeallitem itemId:req
callnative RemoveAllItem
.2byte \itemId

4
src/scrcmd.c
View file

@ -2477,5 +2477,7 @@ void ScriptSetDoubleBattleFlag(struct ScriptContext *ctx)
void RemoveAllItem(struct ScriptContext *ctx)
{
u32 itemId = VarGet(ScriptReadHalfword(ctx));
RemoveBagItem(itemId, CountTotalItemQuantityInBag(itemId));
u32 count = CountTotalItemQuantityInBag(itemId);
gSpecialVar_Result = count;
RemoveBagItem(itemId, count);
}