aboutsummaryrefslogtreecommitdiffstats
path: root/red/text.asm
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-30 13:17:47 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-30 13:17:47 -0400
commit286c160c27e58caad32f776cec684eb8cb2cb22a (patch)
treed89563a88a9674837896d6e88b9c9431b708bf97 /red/text.asm
parentFix IsDungeonMap comments (diff)
parentRemove redundant dimensions in image filenames. (diff)
downloadpokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.tar.gz
pokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.tar.xz
pokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.zip
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts: engine/battle/1c.asm
Diffstat (limited to 'red/text.asm')
-rw-r--r--red/text.asm2
1 files changed, 2 insertions, 0 deletions
diff --git a/red/text.asm b/red/text.asm
new file mode 100644
index 00000000..d5d571d7
--- /dev/null
+++ b/red/text.asm
@@ -0,0 +1,2 @@
+INCLUDE "red.asm"
+INCLUDE "text.asm"