Merge branch 'master' of https://github.com/pret/pokeemerald into menu

2018-02-07 18:06:59 -06:00
parent 5db765a475 48e63979c8
commit 772fd47564
385 changed files with 26738 additions and 46633 deletions
--- a/graphics/unused/old_charmap.pal
+++ b/graphics/unused/old_charmap.pal
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-255 255 255
-24 0 0
-41 0 0
-255 255 255
-0 0 0
-255 255 255
-255 65 0
-0 0 0
-255 0 0
-255 24 0
-255 65 0
-255 98 0
-255 131 0
-255 180 0
-255 222 0
-255 255 255