aboutsummaryrefslogtreecommitdiffstats
path: root/gfx/red
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 /gfx/red
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 'gfx/red')
-rw-r--r--gfx/red/redgreenversion.png (renamed from gfx/red/redgreenversion.h8.png)bin145 -> 145 bytes
-rw-r--r--gfx/red/sgbborder.png (renamed from gfx/red/sgbborder.w128.png)bin1048 -> 1048 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/gfx/red/redgreenversion.h8.png b/gfx/red/redgreenversion.png
index 8b34ec09..8b34ec09 100644
--- a/gfx/red/redgreenversion.h8.png
+++ b/gfx/red/redgreenversion.png
Binary files differ
diff --git a/gfx/red/sgbborder.w128.png b/gfx/red/sgbborder.png
index 7549bb47..7549bb47 100644
--- a/gfx/red/sgbborder.w128.png
+++ b/gfx/red/sgbborder.png
Binary files differ