diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2013-09-16 13:12:42 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2013-09-16 13:12:42 -0400 |
| commit | 4000d7a23ab9a9d46bea6e937ab12d63c3194b89 (patch) | |
| tree | d7f66337ea36fb300f7fc053ba572d05995b5a2f /pokered.asm | |
| parent | give consistency to map names (diff) | |
| parent | revert pokemontools to 7aa016fb (diff) | |
| download | pokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.tar.gz pokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.tar.xz pokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.zip | |
Merge branch 'master' into comments
Diffstat (limited to 'pokered.asm')
| -rw-r--r-- | pokered.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pokered.asm b/pokered.asm index 44e762cc..8a814544 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1,4 +1,4 @@ _RED EQU 1 _BLUE EQU 0 INCLUDE "wram.asm" -INCLUDE "main.tx" +INCLUDE "main.asm" |