diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /graphics | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'graphics')
31 files changed, 225 insertions, 0 deletions
diff --git a/graphics/berry_blender/arrow.pal b/graphics/berry_blender/arrow.pal new file mode 100644 index 000000000..4c975292d --- /dev/null +++ b/graphics/berry_blender/arrow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +213 222 238 +180 197 230 +148 172 222 +115 148 205 +82 123 197 +49 98 189 +255 180 205 +255 115 98 +255 49 0 +205 65 65 +189 24 24 +148 16 16 +74 57 139 +8 0 82 diff --git a/graphics/berry_blender/arrow.png b/graphics/berry_blender/arrow.png Binary files differnew file mode 100644 index 000000000..a40948824 --- /dev/null +++ b/graphics/berry_blender/arrow.png diff --git a/graphics/berry_blender/center.pal b/graphics/berry_blender/center.pal new file mode 100644 index 000000000..606c527a3 --- /dev/null +++ b/graphics/berry_blender/center.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +205 197 255 +172 164 222 +139 139 189 +106 106 156 +74 82 123 +41 57 90 +213 222 189 +180 189 156 +148 156 123 +115 123 90 +255 172 123 +246 115 82 +238 57 41 +156 24 0 diff --git a/graphics/berry_blender/center.png b/graphics/berry_blender/center.png Binary files differnew file mode 100644 index 000000000..1da3629d4 --- /dev/null +++ b/graphics/berry_blender/center.png diff --git a/graphics/berry_blender/center_map.bin b/graphics/berry_blender/center_map.bin Binary files differnew file mode 100644 index 000000000..ef28d5093 --- /dev/null +++ b/graphics/berry_blender/center_map.bin diff --git a/graphics/berry_blender/countdown_numbers.png b/graphics/berry_blender/countdown_numbers.png Binary files differnew file mode 100644 index 000000000..7884d0c07 --- /dev/null +++ b/graphics/berry_blender/countdown_numbers.png diff --git a/graphics/berry_blender/marubatsu.png b/graphics/berry_blender/marubatsu.png Binary files differnew file mode 100644 index 000000000..f927bbce9 --- /dev/null +++ b/graphics/berry_blender/marubatsu.png diff --git a/graphics/berry_blender/misc.pal b/graphics/berry_blender/misc.pal new file mode 100644 index 000000000..9c1db8d12 --- /dev/null +++ b/graphics/berry_blender/misc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +255 213 0 +255 82 82 +98 255 255 +0 189 255 +98 255 98 +205 0 0 +255 0 0 +255 156 156 +0 0 0 +255 255 0 +255 255 148 +189 189 189 +255 255 255 diff --git a/graphics/berry_blender/outer.pal b/graphics/berry_blender/outer.pal new file mode 100644 index 000000000..c3b83cf16 --- /dev/null +++ b/graphics/berry_blender/outer.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +213 222 238 +180 197 230 +148 172 222 +115 148 205 +82 123 197 +49 98 189 +255 180 205 +255 115 98 +255 49 0 +205 65 65 +189 24 24 +148 123 197 +74 57 139 +8 0 82 diff --git a/graphics/berry_blender/outer.png b/graphics/berry_blender/outer.png Binary files differnew file mode 100644 index 000000000..d8040b022 --- /dev/null +++ b/graphics/berry_blender/outer.png diff --git a/graphics/berry_blender/outer_map.bin b/graphics/berry_blender/outer_map.bin Binary files differnew file mode 100644 index 000000000..092e3997e --- /dev/null +++ b/graphics/berry_blender/outer_map.bin diff --git a/graphics/berry_blender/particles.png b/graphics/berry_blender/particles.png Binary files differnew file mode 100644 index 000000000..d0086b029 --- /dev/null +++ b/graphics/berry_blender/particles.png diff --git a/graphics/berry_blender/start.png b/graphics/berry_blender/start.png Binary files differnew file mode 100644 index 000000000..5c8d8d5d9 --- /dev/null +++ b/graphics/berry_blender/start.png diff --git a/graphics/misc/japanese_hof.pal b/graphics/misc/japanese_hof.pal new file mode 100644 index 000000000..f50aa5341 --- /dev/null +++ b/graphics/misc/japanese_hof.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +131 238 197 +255 32 32 +115 222 180 +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 +65 65 65 +255 255 255 diff --git a/graphics/misc/japanese_hof.png b/graphics/misc/japanese_hof.png Binary files differnew file mode 100644 index 000000000..6d88a48b2 --- /dev/null +++ b/graphics/misc/japanese_hof.png diff --git a/graphics/pokenav/brendan_icon.pal b/graphics/pokenav/brendan_icon.pal new file mode 100644 index 000000000..a83ed903f --- /dev/null +++ b/graphics/pokenav/brendan_icon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 213 180 +255 197 148 +222 148 115 +123 65 65 +57 74 123 +41 57 98 +24 41 82 +16 32 57 +222 230 238 +115 205 115 +74 148 82 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/pokenav/brendan_icon.png b/graphics/pokenav/brendan_icon.png Binary files differnew file mode 100644 index 000000000..19e39bb29 --- /dev/null +++ b/graphics/pokenav/brendan_icon.png diff --git a/graphics/pokenav/cursor.pal b/graphics/pokenav/cursor.pal new file mode 100644 index 000000000..b35568acf --- /dev/null +++ b/graphics/pokenav/cursor.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 156 0 +255 255 255 +255 255 255 +230 230 246 +205 205 230 +180 180 222 +156 156 205 +131 131 197 +98 98 180 +74 74 164 +49 49 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/cursor_large.png b/graphics/pokenav/cursor_large.png Binary files differnew file mode 100644 index 000000000..eeda68a0e --- /dev/null +++ b/graphics/pokenav/cursor_large.png diff --git a/graphics/pokenav/cursor_small.png b/graphics/pokenav/cursor_small.png Binary files differnew file mode 100644 index 000000000..031e7ed16 --- /dev/null +++ b/graphics/pokenav/cursor_small.png diff --git a/graphics/pokenav/fly_target_icons.pal b/graphics/pokenav/fly_target_icons.pal new file mode 100644 index 000000000..c0f2cc4e9 --- /dev/null +++ b/graphics/pokenav/fly_target_icons.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 0 0 +0 0 0 +0 0 0 +205 205 205 +0 0 0 +0 0 0 +255 213 222 +255 164 197 +197 98 115 +131 131 123 +98 90 90 +49 49 65 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/pokenav/fly_target_icons.png b/graphics/pokenav/fly_target_icons.png Binary files differnew file mode 100644 index 000000000..7a997afc5 --- /dev/null +++ b/graphics/pokenav/fly_target_icons.png diff --git a/graphics/pokenav/map_frame.bin b/graphics/pokenav/map_frame.bin Binary files differnew file mode 100644 index 000000000..eb8e9ee62 --- /dev/null +++ b/graphics/pokenav/map_frame.bin diff --git a/graphics/pokenav/map_frame.png b/graphics/pokenav/map_frame.png Binary files differnew file mode 100644 index 000000000..f64171746 --- /dev/null +++ b/graphics/pokenav/map_frame.png diff --git a/graphics/pokenav/may_icon.pal b/graphics/pokenav/may_icon.pal new file mode 100644 index 000000000..2833b2613 --- /dev/null +++ b/graphics/pokenav/may_icon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +222 164 148 +205 131 115 +123 90 82 +98 98 115 +41 57 65 +164 106 82 +74 49 57 +205 205 222 +106 213 65 +65 172 32 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/pokenav/may_icon.png b/graphics/pokenav/may_icon.png Binary files differnew file mode 100644 index 000000000..5e1809fa5 --- /dev/null +++ b/graphics/pokenav/may_icon.png diff --git a/graphics/pokenav/region_map.pal b/graphics/pokenav/region_map.pal new file mode 100644 index 000000000..78ffc009a --- /dev/null +++ b/graphics/pokenav/region_map.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +156 213 255 +164 180 255 +123 180 213 +74 156 230 +41 131 230 +65 106 205 +0 115 172 +32 74 197 +0 57 139 +213 255 123 +172 238 49 +98 213 0 +57 172 8 +0 115 0 +205 205 148 +0 0 0 +255 255 255 +238 230 172 +238 230 115 +238 189 57 +246 213 82 +230 164 0 +255 172 16 +255 57 16 +246 0 0 +148 0 0 +205 205 205 +98 98 98 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokenav/region_map.png b/graphics/pokenav/region_map.png Binary files differnew file mode 100644 index 000000000..08df6eb29 --- /dev/null +++ b/graphics/pokenav/region_map.png diff --git a/graphics/pokenav/region_map_map.bin b/graphics/pokenav/region_map_map.bin Binary files differnew file mode 100644 index 000000000..889fd6d36 --- /dev/null +++ b/graphics/pokenav/region_map_map.bin diff --git a/graphics/pokenav/region_map_section_layout.bin b/graphics/pokenav/region_map_section_layout.bin Binary files differnew file mode 100644 index 000000000..4700e08b6 --- /dev/null +++ b/graphics/pokenav/region_map_section_layout.bin diff --git a/graphics/unknown/unknown_339514.pal b/graphics/unknown/unknown_339514.pal new file mode 100644 index 000000000..b87f25a6c --- /dev/null +++ b/graphics/unknown/unknown_339514.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +213 222 238 +180 197 230 +148 172 222 +115 148 205 +82 123 197 +49 98 189 +255 230 205 +255 164 98 +255 106 0 +222 65 8 +189 24 24 +106 106 0 +222 65 8 +189 24 24 |
