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
@@ -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
@@ -0,0 +1 @@
+����������������������������������������������������������
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+74 205 238
+49 164 238
+0 90 131
+24 98 197
+0 139 90
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+238 255 255
+65 65 123
+255 255 255
+180 222 255
+139 172 213
+98 123 172
+57 74 131
+16 24 90
+180 222 255
+139 172 213
+98 123 172
+57 74 131
+16 24 90
+255 255 255
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+156 213 255
+0 115 0
+164 180 255
+57 172 8
+189 0 49
+255 106 139
+164 0 8
+246 0 0
+255 189 205
+255 164 49
+238 230 172
+230 164 0
+238 189 57
+205 205 148
+98 213 0
+0 0 0
+172 238 49
+213 255 123
+238 230 115
+74 156 230
+41 131 230
+24 65 197
+57 131 197
+246 213 82
+32 74 197
+65 106 205
+0 0 0
+255 230 131
+255 156 0
+180 0 0
+255 255 255
+0 0 0
+205 238 255
+197 213 255
+98 98 98
+205 205 205
+189 123 0
+0 0 0
+123 180 213
+0 115 172
+0 57 139
+255 172 16
+255 57 16
+148 0 0
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+164 148 222
+172 156 238
+255 255 255
+205 205 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
+0 0 0
+0 0 0
+0 0 0
@@ -0,0 +1 @@
+#$
@@ -0,0 +1,2 @@
+
+