dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
parent db8a5c6c2b f8cef9a6a8
commit 949509aade
82 changed files with 3472 additions and 6562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5515
asm/berry_crush.s
View File

File diff suppressed because it is too large Load Diff

16
asm/macros/event.inc
View File

@@ -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