diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-11-06 19:49:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-06 19:49:14 -0500 |
commit | 2b944fd7213baa0d54003e0b876c4e3e5df4dfbd (patch) | |
tree | a6b514e610ec3ef32e597f1917c77d34f5e272e8 /asm/macros | |
parent | 25d026aded10c9a9567d214e46bf41ff4153eb46 (diff) | |
parent | 1475c4d8da2e27734aa5a738e2287222c1e21386 (diff) |
Merge branch 'master' into doc-trickhouse
Diffstat (limited to 'asm/macros')
-rw-r--r-- | asm/macros/event.inc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 64f2cdc92..40430fe53 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1630,6 +1630,14 @@ call_if 5, \dest .endm + .macro vgoto_if_eq dest:req + vgoto_if 1, \dest + .endm + + .macro vgoto_if_ne dest:req + vgoto_if 0, \dest + .endm + .macro switch var:req copyvar VAR_0x8000, \var .endm @@ -1671,3 +1679,10 @@ setorcopyvar VAR_0x8000, \trainer callstd STD_REGISTER_MATCH_CALL .endm + + .macro dofieldeffectsparkle x:req, y:req, priority:req + setfieldeffectargument 0, \x + setfieldeffectargument 1, \y + setfieldeffectargument 2, \priority + dofieldeffect FLDEFF_SPARKLE + .endm |