diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-02-01 08:46:53 -0500 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-02-01 08:46:53 -0500 |
| commit | ed4ac6d55156f7dab8e609f4086db270264ce594 (patch) | |
| tree | 20bf3f15d294c7e95d6f2be94cd913d7d6896cc6 /pokered.asm | |
| parent | 71d31fee0ec5c9f58963f20d53e5cf7114370a2f (diff) | |
| parent | b48435bb260e87bd27cc954eb5f2473c4f80c8f4 (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
main.asm
Diffstat (limited to 'pokered.asm')
| -rw-r--r-- | pokered.asm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pokered.asm b/pokered.asm index bcc826c8..ff8de04f 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1,5 +1,2 @@ -_RED EQU 1 -_BLUE EQU 0 -INCLUDE "globals.asm" -INCLUDE "wram.asm" +INCLUDE "red.asm" INCLUDE "main.asm" |