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

fix PR merge conflicts

Browse Source
This commit is contained in:
Evan
2019-11-21 09:31:40 -07:00
parent e6bc189a03 1234d0252c
commit 407d22af8e
47 changed files with 1979 additions and 4704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/evolution_scene/bg.bin
BIN
View File
Binary file not shown.
graphics/evolution_scene/bg.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

graphics/evolution_scene/bg2.bin
BIN
View File
Binary file not shown.
graphics/evolution_scene/gray_transition_intro.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
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 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/evolution_scene/transition.pal
+35
View File
@@ -0,0 +1,35 @@
JASC-PAL
0100
32
0 0 0
16 16 16
24 32 32
41 49 49
49 65 74
65 82 90
74 98 115
90 115 131
106 131 148
115 148 172
131 164 189
139 180 213
156 197 230
172 213 255
0 0 0
0 0 0
0 0 0
65 90 106
74 98 115
82 106 131
90 115 139
98 131 156
106 139 164
115 148 180
123 156 189
131 172 205
139 180 213
148 189 230
156 197 238
172 213 255
0 0 0
0 0 0
graphics/evolution_scene/unknown_5B4114.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
90 90 90
98 106 106
115 123 123
131 131 131
148 148 148
156 164 164
172 172 172
189 189 189
197 205 205
213 213 213
230 230 230
246 246 246
255 255 255
0 0 0
0 0 0
graphics/evolution_scene/unref_83F7D80.bin
BIN
View File
Binary file not shown.
graphics/field_effects/flash_black.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
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 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/field_effects/flash_effect_map.bin
BIN
View File
Binary file not shown.
graphics/field_effects/flash_effect_tiles.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 199 B

graphics/field_effects/flash_gradient.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
148 197 172
16 16 16
32 32 32
49 49 49
65 65 65
82 82 82
98 98 98
115 115 115
131 131 131
148 148 148
164 164 164
180 180 180
197 197 197
213 213 213
230 230 230
255 255 255
graphics/field_effects/flash_white.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
graphics/map_objects/unk_835B988.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
172 123 65
255 197 148
222 148 115
123 65 65
65 65 213
57 57 123
115 164 197
106 41 41
238 238 255
180 180 213
255 106 74
197 57 57
255 222 90
189 156 57
0 0 0