diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-19 22:17:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 22:17:37 -0500 |
| commit | a7e6045d71d2d21c4fa5a494d112c6b38226eaec (patch) | |
| tree | 2f0bd67223e68cbbee52749245aff70ebb90accb /asm/macros/event.inc | |
| parent | 69759b2d128ea27f3bc9ebdb7e58ea3698d0a491 (diff) | |
| parent | f899a02ac642e66ab9b6baa28903921863529171 (diff) | |
Merge pull request #1597 from GriffinRichards/misc-cleanup
Miscellaneous fixes
Diffstat (limited to 'asm/macros/event.inc')
| -rw-r--r-- | asm/macros/event.inc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 28f010ef2..58e37d0a6 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -604,9 +604,8 @@ .endm @ Blocks script execution until the movements being applied to the specified (localId) object finish. - @ If the specified object is 0, then the command will block script execution until all objects - @ affected by applymovement finish their movements. If the specified object is not currently being - @ manipulated with applymovement, then this command does nothing. + @ If localId is 0, then the id of the last-moved object will be used instead. If the specified object + @ is not currently being manipulated with applymovement, then this command does nothing. @ If no map is specified, then the current map is used. .macro waitmovement localId:req, map .ifb \map @@ -987,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 @@ -1433,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 @@ -1932,3 +1931,11 @@ waitbuttonpress closebraillemessage .endm + + @ Creates an "event legal" Pokémon for an encounter + .macro seteventmon species:req, level:req, item=ITEM_NONE + setvar VAR_0x8004, \species + setvar VAR_0x8005, \level + setvar VAR_0x8006, \item + special CreateEventLegalEnemyMon + .endm |