Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine

This commit is contained in:
Phlosioneer
2019-02-13 23:04:56 -05:00
33 changed files with 294 additions and 218 deletions

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