diff options
| author | huderlem <huderlem@gmail.com> | 2019-12-17 19:26:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 19:26:04 -0600 |
| commit | 45eefac5b9d25015671341f5f8888dc602d1a293 (patch) | |
| tree | c2d5f2f056d753bb65dfd36ec3ca7d27419f2c31 /asm/macros/event.inc | |
| parent | edb5df1716beb4ea81ef0493a3fac0a43cc6eae5 (diff) | |
| parent | 4879c1eab27b0a01410d6c56c0a25b8152b166b8 (diff) | |
Merge pull request #934 from GriffinRichards/constants-fade
Use fadescreen constants
Diffstat (limited to 'asm/macros/event.inc')
| -rw-r--r-- | asm/macros/event.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 96971b583..8b43d0821 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1101,16 +1101,16 @@ .2byte \index .endm - @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. - .macro fadescreen effect:req + @ Fades the screen to and from black and white. Modes are FADE_(TO/FROM)_(WHITE/BLACK) + .macro fadescreen mode:req .byte 0x97 - .byte \effect + .byte \mode .endm - @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist. - .macro fadescreenspeed effect:req, speed:req + @ Fades the screen to and from black and white. Modes are FADE_(TO/FROM)_(WHITE/BLACK) + .macro fadescreenspeed mode:req, speed:req .byte 0x98 - .byte \effect + .byte \mode .byte \speed .endm @@ -1517,9 +1517,9 @@ .4byte \pointer .endm - .macro fadescreenswapbuffers byte:req + .macro fadescreenswapbuffers mode:req .byte 0xdc - .byte \byte + .byte \mode .endm .macro buffertrainerclassname out:req, class:req |