diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2013-12-15 16:18:14 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2013-12-15 16:18:14 -0600 |
| commit | 549fe35420c2cd114cafa5997633297fa3ff9290 (patch) | |
| tree | 454f88103f1a3616612afd73bc532adbdf036459 /pokered.asm | |
| parent | Nicknaming screen loads the 'ED' symbol separately. (diff) | |
| parent | incbin killing part 2 (diff) | |
| download | pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.tar.gz pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.tar.xz pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.zip | |
Merged and fixed incbin conflicts with Danny.
Diffstat (limited to 'pokered.asm')
| -rw-r--r-- | pokered.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pokered.asm b/pokered.asm index 8a814544..bcc826c8 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1,4 +1,5 @@ _RED EQU 1 _BLUE EQU 0 +INCLUDE "globals.asm" INCLUDE "wram.asm" INCLUDE "main.asm" |