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

2018-01-21 15:22:05 -05:00
parent c408110319 a1aa645f23
commit 35cc20c9aa
293 changed files with 8429 additions and 2787 deletions
--- a/graphics/misc/birch_bag.png
+++ b/graphics/misc/birch_bag.png
--- a/graphics/misc/birch_bag_map.bin
+++ b/graphics/misc/birch_bag_map.bin
--- a/graphics/misc/birch_ballarrow.png
+++ b/graphics/misc/birch_ballarrow.png
--- a/graphics/misc/birch_circle.png
+++ b/graphics/misc/birch_circle.png
--- a/graphics/misc/birch_grass.png
+++ b/graphics/misc/birch_grass.png
--- a/graphics/misc/birch_grass_map.bin
+++ b/graphics/misc/birch_grass_map.bin
--- a/graphics/misc/fossil.png
+++ b/graphics/misc/fossil.png
--- a/graphics/misc/mirage_tower.bin
+++ b/graphics/misc/mirage_tower.bin
@@ -0,0 +1,2 @@
+````````	`
+```
``````````````````` `!`"`#`$`%`&`'`(`)`*`+`,`-`.`/`0`1`2`3`4`5`6`7`8`9`:`;`<`=`>`?`@`A`B`C`D`E`F`G`H`
--- a/graphics/misc/mirage_tower.png
+++ b/graphics/misc/mirage_tower.png
--- a/graphics/misc/mirage_tower_crumbles.png
+++ b/graphics/misc/mirage_tower_crumbles.png
--- a/graphics/misc/mon_markings.png
+++ b/graphics/misc/mon_markings.png
--- a/graphics/misc/option_menu_equals_sign.png
+++ b/graphics/misc/option_menu_equals_sign.png
--- a/graphics/misc/option_menu_text.pal
+++ b/graphics/misc/option_menu_text.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 180 82
+197 123 0
+255 139 131
+255 49 24
+74 74 74
+213 213 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0