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 /pokeblue.asm | |
| parent | c62f47cc5ef837d92967dcab4716a8ebaa5916b6 (diff) | |
| parent | 74360178fb77e80991cfacbc57178df3c9c3ee9e (diff) | |
Merge.
hg-commit-id: 59809815188e
Diffstat (limited to 'pokeblue.asm')
| -rw-r--r-- | pokeblue.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pokeblue.asm b/pokeblue.asm index 75489ac5..74fd7e51 100644 --- a/pokeblue.asm +++ b/pokeblue.asm @@ -1,3 +1,3 @@ -_RED EQU 0
-_BLUE EQU 1
+_RED EQU 0 +_BLUE EQU 1 INCLUDE "common.tx"
\ No newline at end of file |