summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2022-01-11 02:08:14 -0500
committerGriffinR <griffin.g.richards@gmail.com>2022-01-11 02:08:14 -0500
commit110fbc559cc658179e127117c68d9eea9474a61a (patch)
treefaa94232eae8ce54a79993ebf237da6faa85964a /asm/macros
parentce55e58ad83e57b7e1fde7eeb3c3c94365fe0f12 (diff)
Make item optional for givemon and setwildbattle
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/event.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 8d65f602d..d85cfb975 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -986,7 +986,7 @@
@ Gives the player a Pokémon of the specified species and level, holding the specified item. The trailing 0s are unused parameters.
@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome.
- .macro givemon species:req, level:req, item:req
+ .macro givemon species:req, level:req, item=ITEM_NONE
.byte 0x79
.2byte \species
.byte \level
@@ -1432,7 +1432,7 @@
@ Prepares to start a wild battle against a 'species' at 'level' holding 'item'. Running this command will not affect
@ normal wild battles. You start the prepared battle with dowildbattle.
- .macro setwildbattle species:req, level:req, item:req
+ .macro setwildbattle species:req, level:req, item=ITEM_NONE
.byte 0xb6
.2byte \species
.byte \level