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

Merge branch 'master' into multiplayer-stuff

Browse Source
This commit is contained in:
Phlosioneer
2019-02-18 01:12:47 -05:00
parent 08579edbcd e95140270b
commit 5695617d64
34 changed files with 300 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
asm/macros/battle_script.inc
View File

@@ -1341,15 +1341,15 @@
.endm
.macro sethword dst:req, value:req
setbyte \dst, \value & 0xFF
setbyte \dst + 1, (\value >> 8) & 0xFF
setbyte \dst, (\value) & 0xFF
setbyte \dst + 1, ((\value) >> 8) & 0xFF
.endm
.macro setword dst:req, value:req
setbyte \dst, \value & 0xFF
setbyte \dst + 1, (\value >> 8) & 0xFF
setbyte \dst + 2, (\value >> 16) & 0xFF
setbyte \dst + 3, (\value >> 24) & 0xFF
setbyte \dst, (\value) & 0xFF
setbyte \dst + 1, ((\value) >> 8) & 0xFF
setbyte \dst + 2, ((\value) >> 16) & 0xFF
setbyte \dst + 3, ((\value) >> 24) & 0xFF
.endm
.macro copybyte dst:req, src:req

2
asm/macros/event.inc
View File

@@ -313,7 +313,7 @@
.endm
@ Runs time based events. In FireRed, this command is a nop.
.macro dodailyevents
.macro dotimebasedevents
.byte 0x2d
.endm