diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2012-01-15 00:44:19 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2012-01-15 00:44:19 -0600 |
| commit | f22a89b46d43f65ace938e9e59c63cb213fc0a0d (patch) | |
| tree | a15c9f8c6957d69c47a7f1bed22ecc8aa4a314da /pokered.asm | |
| parent | GenRandom for gbz80disasm (diff) | |
| parent | Palette differences between Red and Blue version. (diff) | |
| download | pokeyellow-f22a89b46d43f65ace938e9e59c63cb213fc0a0d.tar.gz pokeyellow-f22a89b46d43f65ace938e9e59c63cb213fc0a0d.tar.xz pokeyellow-f22a89b46d43f65ace938e9e59c63cb213fc0a0d.zip | |
Merge.
hg-commit-id: 59809815188e
Diffstat (limited to 'pokered.asm')
| -rw-r--r-- | pokered.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pokered.asm b/pokered.asm index 5f6d90b0..7d73ecc9 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1,3 +1,3 @@ -_RED EQU 1
-_BLUE EQU 0
+_RED EQU 1 +_BLUE EQU 0 INCLUDE "common.tx"
\ No newline at end of file |