diff options
| author | dannye <corrnondacqb@yahoo.com> | 2013-09-10 20:04:54 -0700 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2013-09-10 20:04:54 -0700 |
| commit | d256be1b09179f375e0515871970a90349242955 (patch) | |
| tree | 544a8ff6bbd7a4b707be48e855c645d0e39a3138 /pokered.asm | |
| parent | Merge branch 'comments' of https://github.com/dannye/pokered (diff) | |
| parent | Merge branch kanzure/master into dannye-incbins (diff) | |
| download | pokeyellow-d256be1b09179f375e0515871970a90349242955.tar.gz pokeyellow-d256be1b09179f375e0515871970a90349242955.tar.xz pokeyellow-d256be1b09179f375e0515871970a90349242955.zip | |
Merge pull request #1 from kanzure/dannye-incbins
Merge so that iimarckus does less work
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" |