diff options
| author | Sanky <gsanky@gmail.com> | 2013-10-21 20:24:46 +0200 |
|---|---|---|
| committer | Sanky <gsanky@gmail.com> | 2013-10-21 20:24:46 +0200 |
| commit | b5268ab9207f02574abe8d6f5407e25f4a86365a (patch) | |
| tree | adce2892dd4c07781f2db42854e30fc25dba8b15 /pokered.asm | |
| parent | AskForMonNickname (diff) | |
| parent | Fix CheckIfInOutsideMap comments. (diff) | |
| download | pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.tar.gz pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.tar.xz pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.zip | |
Merge remote-tracking branch 'kanzure/master' into mergetastic
Conflicts:
main.asm
Diffstat (limited to 'pokered.asm')
| -rw-r--r-- | pokered.asm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pokered.asm b/pokered.asm index a6e1f6c8..8a814544 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1,3 +1,4 @@ _RED EQU 1 _BLUE EQU 0 -INCLUDE "main.tx" +INCLUDE "wram.asm" +INCLUDE "main.asm" |