dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict about graphics_file_rules.mk and prepare for adding pokemon graphics

Browse Source
This commit is contained in:
paul
2018-10-10 22:54:23 +02:00
parent 1ee1ebe23a 10fff9c6f2
commit 3f0827128a
42 changed files with 1111 additions and 2350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/pokemon/palettes/circled_question_mark_palette.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 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
205 205 205
172 172 172
255 255 255
0 0 0
graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
123 172 172
32 32 32
32 32 32
32 32 32
32 32 32
32 32 32
32 32 32
32 32 32
32 32 32
32 32 32
32 32 32
32 32 32
172 172 172
139 139 139
222 222 222
32 32 32