diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-10 20:08:49 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-10 20:08:49 -0500 |
| commit | e47308a1f88f19dfc0ee5cb42dc643a520d9175b (patch) | |
| tree | 7ae7bb3ff46ceeab012869db3cbdad86545a0496 /pokered.asm | |
| parent | a684941cfcf88942cbecaecf997609acc3652a1a (diff) | |
| parent | 37c80175368352710e20f752ebfdc1e9e3ac3e2b (diff) | |
Merge branch kanzure/master into dannye-incbins
Conflicts:
extras
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" |