aboutsummaryrefslogtreecommitdiffstats
path: root/maps
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
commitd2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch)
treef581489b522fc647477d7b36dee072d553c44fd1 /maps
parentMake pokeyellow build to baserom. (diff)
parentMerge pull request #114 from YamaArashi/master (diff)
downloadpokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.gz
pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.xz
pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'maps')
-rw-r--r--maps/colosseum.blk (renamed from maps/tradecenterm.blk)0
-rw-r--r--maps/tradecenter.blk (renamed from maps/battlecenterm.blk)0
2 files changed, 0 insertions, 0 deletions
diff --git a/maps/tradecenterm.blk b/maps/colosseum.blk
index d05a5b43..d05a5b43 100644
--- a/maps/tradecenterm.blk
+++ b/maps/colosseum.blk
diff --git a/maps/battlecenterm.blk b/maps/tradecenter.blk
index 638b48ef..638b48ef 100644
--- a/maps/battlecenterm.blk
+++ b/maps/tradecenter.blk