aboutsummaryrefslogtreecommitdiffstats
path: root/yellow
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 /yellow
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 'yellow')
-rw-r--r--yellow/audio.asm2
-rw-r--r--yellow/main.asm2
-rw-r--r--yellow/text.asm2
-rw-r--r--yellow/wram.asm2
4 files changed, 8 insertions, 0 deletions
diff --git a/yellow/audio.asm b/yellow/audio.asm
new file mode 100644
index 00000000..e94c7db5
--- /dev/null
+++ b/yellow/audio.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "audio.asm"
diff --git a/yellow/main.asm b/yellow/main.asm
new file mode 100644
index 00000000..36c88720
--- /dev/null
+++ b/yellow/main.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "main.asm"
diff --git a/yellow/text.asm b/yellow/text.asm
new file mode 100644
index 00000000..a84a633d
--- /dev/null
+++ b/yellow/text.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "text.asm"
diff --git a/yellow/wram.asm b/yellow/wram.asm
new file mode 100644
index 00000000..c0b7f781
--- /dev/null
+++ b/yellow/wram.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "wram.asm"