diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /graphics/intro | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'graphics/intro')
| -rw-r--r-- | graphics/intro/copyright.bin | bin | 0 -> 1280 bytes | |||
| -rw-r--r-- | graphics/intro/copyright.pal | 19 | ||||
| -rw-r--r-- | graphics/intro/copyright.png | bin | 0 -> 567 bytes | |||
| -rw-r--r-- | graphics/intro/intro2_bgclouds_map.bin | bin | 0 -> 4096 bytes | |||
| -rw-r--r-- | graphics/intro/intro2_bgnight_map.bin | bin | 0 -> 4096 bytes | |||
| -rw-r--r-- | graphics/intro/intro2_bgtrees_map.bin | bin | 0 -> 4096 bytes | |||
| -rw-r--r-- | graphics/intro/intro2_grass_map.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | graphics/intro/intro2_night.png (renamed from graphics/intro/intro2_bgnight2.png) | bin | 212 -> 212 bytes | |||
| -rw-r--r-- | graphics/intro/intro3_pokeball_map.bin | bin | 0 -> 1024 bytes | |||
| -rw-r--r-- | graphics/intro/intro3_streaks.pal | 19 | ||||
| -rw-r--r-- | graphics/intro/intro3_streaks.png | bin | 0 -> 202 bytes | |||
| -rw-r--r-- | graphics/intro/intro3_streaks_map.bin | bin | 0 -> 2048 bytes |
12 files changed, 38 insertions, 0 deletions
diff --git a/graphics/intro/copyright.bin b/graphics/intro/copyright.bin Binary files differnew file mode 100644 index 000000000..367991ff7 --- /dev/null +++ b/graphics/intro/copyright.bin diff --git a/graphics/intro/copyright.pal b/graphics/intro/copyright.pal new file mode 100644 index 000000000..4219d4394 --- /dev/null +++ b/graphics/intro/copyright.pal @@ -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 32 32 +24 57 57 +49 82 82 +82 106 106 +106 131 131 +139 156 156 +164 180 180 +197 205 205 +222 230 230 +255 255 255 diff --git a/graphics/intro/copyright.png b/graphics/intro/copyright.png Binary files differnew file mode 100644 index 000000000..23d6dc2b4 --- /dev/null +++ b/graphics/intro/copyright.png diff --git a/graphics/intro/intro2_bgclouds_map.bin b/graphics/intro/intro2_bgclouds_map.bin Binary files differnew file mode 100644 index 000000000..25b65f766 --- /dev/null +++ b/graphics/intro/intro2_bgclouds_map.bin diff --git a/graphics/intro/intro2_bgnight_map.bin b/graphics/intro/intro2_bgnight_map.bin Binary files differnew file mode 100644 index 000000000..ef7c889ba --- /dev/null +++ b/graphics/intro/intro2_bgnight_map.bin diff --git a/graphics/intro/intro2_bgtrees_map.bin b/graphics/intro/intro2_bgtrees_map.bin Binary files differnew file mode 100644 index 000000000..d1c23cc36 --- /dev/null +++ b/graphics/intro/intro2_bgtrees_map.bin diff --git a/graphics/intro/intro2_grass_map.bin b/graphics/intro/intro2_grass_map.bin Binary files differnew file mode 100644 index 000000000..2a6f1a72b --- /dev/null +++ b/graphics/intro/intro2_grass_map.bin diff --git a/graphics/intro/intro2_bgnight2.png b/graphics/intro/intro2_night.png Binary files differindex 2a9838c6a..2a9838c6a 100755..100644 --- a/graphics/intro/intro2_bgnight2.png +++ b/graphics/intro/intro2_night.png diff --git a/graphics/intro/intro3_pokeball_map.bin b/graphics/intro/intro3_pokeball_map.bin Binary files differnew file mode 100644 index 000000000..2f968aa20 --- /dev/null +++ b/graphics/intro/intro3_pokeball_map.bin diff --git a/graphics/intro/intro3_streaks.pal b/graphics/intro/intro3_streaks.pal new file mode 100644 index 000000000..21ae1e434 --- /dev/null +++ b/graphics/intro/intro3_streaks.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +255 230 74 +255 230 98 +255 238 123 +255 238 148 +255 246 172 +255 255 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/intro/intro3_streaks.png b/graphics/intro/intro3_streaks.png Binary files differnew file mode 100644 index 000000000..a19fa39c4 --- /dev/null +++ b/graphics/intro/intro3_streaks.png diff --git a/graphics/intro/intro3_streaks_map.bin b/graphics/intro/intro3_streaks_map.bin Binary files differnew file mode 100644 index 000000000..2d1b69924 --- /dev/null +++ b/graphics/intro/intro3_streaks_map.bin |
