diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
| commit | 286c160c27e58caad32f776cec684eb8cb2cb22a (patch) | |
| tree | d89563a88a9674837896d6e88b9c9431b708bf97 /red/main.asm | |
| parent | c8a5720cca08631dcc20d036731e261a09a9a76e (diff) | |
| parent | 188ac8a9b4816dd98df0108314e58885c3b07452 (diff) | |
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
engine/battle/1c.asm
Diffstat (limited to 'red/main.asm')
| -rw-r--r-- | red/main.asm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/red/main.asm b/red/main.asm new file mode 100644 index 00000000..ff8de04f --- /dev/null +++ b/red/main.asm @@ -0,0 +1,2 @@ +INCLUDE "red.asm" +INCLUDE "main.asm" |