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/misc | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'graphics/misc')
47 files changed, 458 insertions, 57 deletions
diff --git a/graphics/misc/applause.png b/graphics/misc/applause.png Binary files differdeleted file mode 100755 index 32b1748a0..000000000 --- a/graphics/misc/applause.png +++ /dev/null diff --git a/graphics/misc/birch_bag_map.bin b/graphics/misc/birch_bag_map.bin Binary files differnew file mode 100644 index 000000000..ddfad5ec9 --- /dev/null +++ b/graphics/misc/birch_bag_map.bin diff --git a/graphics/misc/birch_grass_map.bin b/graphics/misc/birch_grass_map.bin Binary files differnew file mode 100644 index 000000000..b7332940c --- /dev/null +++ b/graphics/misc/birch_grass_map.bin diff --git a/graphics/misc/cable_car.pal b/graphics/misc/cable_car.pal new file mode 100755 index 000000000..64985f6da --- /dev/null +++ b/graphics/misc/cable_car.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +164 222 222 +98 139 139 +139 180 180 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +139 205 246 +98 172 238 +255 255 148 +238 213 82 +213 172 16 +180 106 0 +139 65 0 diff --git a/graphics/misc/cable_car.png b/graphics/misc/cable_car.png Binary files differnew file mode 100755 index 000000000..67f581fb9 --- /dev/null +++ b/graphics/misc/cable_car.png diff --git a/graphics/misc/cable_car_bg.pal b/graphics/misc/cable_car_bg.pal new file mode 100755 index 000000000..d543b4cce --- /dev/null +++ b/graphics/misc/cable_car_bg.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +0 0 0 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +255 230 139 +238 205 123 +222 189 115 +205 172 106 +189 156 98 +180 139 90 +230 106 189 +230 106 189 +230 106 189 +0 0 0 +189 255 148 +156 222 98 +131 197 74 +106 164 49 +82 115 24 +57 82 0 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +230 106 189 +0 0 0 +213 238 255 +189 230 255 +164 222 255 +139 213 255 +115 205 255 +98 205 255 +197 205 222 +189 189 197 +180 164 164 +156 131 131 +131 90 90 +123 65 65 +230 106 189 +230 106 189 +230 106 189 +0 0 0 +197 205 246 +172 189 238 +156 172 238 +131 156 230 +115 139 230 +98 123 230 +65 74 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/misc/cable_car_bg.png b/graphics/misc/cable_car_bg.png Binary files differnew file mode 100755 index 000000000..f268ea990 --- /dev/null +++ b/graphics/misc/cable_car_bg.png diff --git a/graphics/misc/cable_car_cord.png b/graphics/misc/cable_car_cord.png Binary files differnew file mode 100755 index 000000000..b8176d3ca --- /dev/null +++ b/graphics/misc/cable_car_cord.png diff --git a/graphics/misc/cable_car_door.png b/graphics/misc/cable_car_door.png Binary files differnew file mode 100755 index 000000000..a61b3f504 --- /dev/null +++ b/graphics/misc/cable_car_door.png diff --git a/graphics/misc/cable_car_mountain_map.bin b/graphics/misc/cable_car_mountain_map.bin new file mode 100644 index 000000000..3d4e092bc --- /dev/null +++ b/graphics/misc/cable_car_mountain_map.bin @@ -0,0 +1 @@ +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o!!!!!!!!!!!!!!!!q!r!s!t!u!v!w!x!y!z!{!|!}!~!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
\ No newline at end of file diff --git a/graphics/misc/cable_car_mt_chimney_map.bin b/graphics/misc/cable_car_mt_chimney_map.bin Binary files differnew file mode 100644 index 000000000..8ae7818bf --- /dev/null +++ b/graphics/misc/cable_car_mt_chimney_map.bin diff --git a/graphics/misc/cable_car_pylon_stem_map.bin b/graphics/misc/cable_car_pylon_stem_map.bin new file mode 100644 index 000000000..e6f12efc6 --- /dev/null +++ b/graphics/misc/cable_car_pylon_stem_map.bin @@ -0,0 +1,2 @@ + +0 0 0
000 0 0 0 0 0 0 0 0 0 0 0 000 0 0 0 0 0 0 0 0 0 0 0 000 0 0 0 0 0 0 0 0 0 0 0 000 0 0 0 0 0 0 0 0 0 0 0 0
\ No newline at end of file diff --git a/graphics/misc/cable_car_tree_map.bin b/graphics/misc/cable_car_tree_map.bin Binary files differnew file mode 100644 index 000000000..1e9b7a8f8 --- /dev/null +++ b/graphics/misc/cable_car_tree_map.bin diff --git a/graphics/misc/cave_transition.png b/graphics/misc/cave_transition.png Binary files differnew file mode 100644 index 000000000..dd265149f --- /dev/null +++ b/graphics/misc/cave_transition.png diff --git a/graphics/misc/cave_transition_map.bin b/graphics/misc/cave_transition_map.bin Binary files differnew file mode 100644 index 000000000..4293bfd1c --- /dev/null +++ b/graphics/misc/cave_transition_map.bin diff --git a/graphics/misc/clock.png b/graphics/misc/clock.png Binary files differnew file mode 100644 index 000000000..28780c1d1 --- /dev/null +++ b/graphics/misc/clock.png diff --git a/graphics/misc/condition_up_down.pal b/graphics/misc/condition_up_down.pal new file mode 100644 index 000000000..5b0cfcd3c --- /dev/null +++ b/graphics/misc/condition_up_down.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 180 246 +255 255 0 +255 0 0 +0 0 255 +222 222 222 +213 213 213 +205 205 205 +197 197 197 +189 189 189 +180 180 180 +172 172 172 +164 164 164 +148 148 148 +139 139 139 +131 131 131 +0 0 0 diff --git a/graphics/misc/condition_up_down.png b/graphics/misc/condition_up_down.png Binary files differnew file mode 100644 index 000000000..7d4049d86 --- /dev/null +++ b/graphics/misc/condition_up_down.png diff --git a/graphics/misc/darkness_field_move_streaks.pal b/graphics/misc/darkness_field_move_streaks.pal new file mode 100644 index 000000000..37ea1ae61 --- /dev/null +++ b/graphics/misc/darkness_field_move_streaks.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 139 57 +0 0 0 +148 148 148 +197 197 197 +255 255 255 +123 156 230 +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 diff --git a/graphics/misc/darkness_field_move_streaks.png b/graphics/misc/darkness_field_move_streaks.png Binary files differnew file mode 100644 index 000000000..825d695eb --- /dev/null +++ b/graphics/misc/darkness_field_move_streaks.png diff --git a/graphics/misc/darkness_field_move_streaks_map.bin b/graphics/misc/darkness_field_move_streaks_map.bin Binary files differnew file mode 100644 index 000000000..f7c2f2142 --- /dev/null +++ b/graphics/misc/darkness_field_move_streaks_map.bin diff --git a/graphics/misc/decoration_10000.png b/graphics/misc/decoration_10000.png Binary files differnew file mode 100644 index 000000000..b9ee418f3 --- /dev/null +++ b/graphics/misc/decoration_10000.png diff --git a/graphics/misc/end_copyright.png b/graphics/misc/end_copyright.png Binary files differnew file mode 100644 index 000000000..57fc6114a --- /dev/null +++ b/graphics/misc/end_copyright.png diff --git a/graphics/misc/field_move_streaks.pal b/graphics/misc/field_move_streaks.pal new file mode 100644 index 000000000..12bc76261 --- /dev/null +++ b/graphics/misc/field_move_streaks.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +255 255 255 +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 diff --git a/graphics/misc/field_move_streaks.png b/graphics/misc/field_move_streaks.png Binary files differnew file mode 100644 index 000000000..8becc4413 --- /dev/null +++ b/graphics/misc/field_move_streaks.png diff --git a/graphics/misc/field_move_streaks_map.bin b/graphics/misc/field_move_streaks_map.bin Binary files differnew file mode 100644 index 000000000..466f456be --- /dev/null +++ b/graphics/misc/field_move_streaks_map.bin diff --git a/graphics/misc/hof.pal b/graphics/misc/hof.pal new file mode 100644 index 000000000..b4fffc172 --- /dev/null +++ b/graphics/misc/hof.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +0 0 0 +255 213 230 +255 32 32 +255 180 230 +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/hof.png b/graphics/misc/hof.png Binary files differnew file mode 100644 index 000000000..b60489544 --- /dev/null +++ b/graphics/misc/hof.png diff --git a/graphics/misc/interview_arrow.png b/graphics/misc/interview_arrow.png Binary files differnew file mode 100644 index 000000000..f1e59bca8 --- /dev/null +++ b/graphics/misc/interview_arrow.png diff --git a/graphics/misc/interview_buttons.png b/graphics/misc/interview_buttons.png Binary files differnew file mode 100644 index 000000000..3e18c85f9 --- /dev/null +++ b/graphics/misc/interview_buttons.png diff --git a/graphics/misc/interview_outline_cursor.png b/graphics/misc/interview_outline_cursor.png Binary files differnew file mode 100644 index 000000000..c9ade7073 --- /dev/null +++ b/graphics/misc/interview_outline_cursor.png diff --git a/graphics/misc/interview_pal0.pal b/graphics/misc/interview_pal0.pal new file mode 100644 index 000000000..dfe91b5de --- /dev/null +++ b/graphics/misc/interview_pal0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 148 +255 197 148 +238 139 90 +189 90 41 +255 213 213 +246 180 180 +197 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +41 49 49 +98 98 98 +180 189 180 +222 213 222 +255 255 255 diff --git a/graphics/misc/interview_pal1.pal b/graphics/misc/interview_pal1.pal new file mode 100644 index 000000000..72d2547f9 --- /dev/null +++ b/graphics/misc/interview_pal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 164 0 +255 0 0 +255 32 32 +255 74 74 +255 106 106 +255 148 148 +255 180 180 +255 222 222 +255 255 255 +255 255 255 +255 255 205 +255 255 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/misc/interview_triangle_cursor.png b/graphics/misc/interview_triangle_cursor.png Binary files differnew file mode 100644 index 000000000..f3f00ca4d --- /dev/null +++ b/graphics/misc/interview_triangle_cursor.png diff --git a/graphics/misc/judge.pal b/graphics/misc/judge.pal deleted file mode 100755 index e62f2abd3..000000000 --- a/graphics/misc/judge.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -156 197 164 -255 222 205 -222 180 148 -172 115 90 -238 238 238 -90 57 57 -57 49 65 -0 0 0 -82 90 8 -57 65 16 -222 82 82 -246 197 49 -246 230 139 -131 131 148 -164 164 180 -205 205 222 diff --git a/graphics/misc/judge.png b/graphics/misc/judge.png Binary files differdeleted file mode 100755 index c4dcf520b..000000000 --- a/graphics/misc/judge.png +++ /dev/null diff --git a/graphics/misc/judge_symbols.pal b/graphics/misc/judge_symbols.pal deleted file mode 100755 index 3eeaa1128..000000000 --- a/graphics/misc/judge_symbols.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 148 115 -255 106 115 -255 57 57 -156 0 0 -164 222 255 -106 148 255 -49 82 255 -255 255 115 -246 222 65 -230 106 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 diff --git a/graphics/misc/judge_symbols.png b/graphics/misc/judge_symbols.png Binary files differdeleted file mode 100755 index 7669fb88b..000000000 --- a/graphics/misc/judge_symbols.png +++ /dev/null diff --git a/graphics/misc/nextturn.pal b/graphics/misc/nextturn.pal deleted file mode 100755 index 05991c79e..000000000 --- a/graphics/misc/nextturn.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -148 90 16 -246 189 115 -255 222 115 -255 255 156 -255 49 24 -213 16 0 -246 156 222 -255 0 90 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/misc/nextturn.png b/graphics/misc/nextturn.png Binary files differdeleted file mode 100755 index 747c4b5a7..000000000 --- a/graphics/misc/nextturn.png +++ /dev/null diff --git a/graphics/misc/pokeblock.png b/graphics/misc/pokeblock.png Binary files differdeleted file mode 100755 index fd24e0621..000000000 --- a/graphics/misc/pokeblock.png +++ /dev/null diff --git a/graphics/misc/trainer_card.png b/graphics/misc/trainer_card.png Binary files differnew file mode 100644 index 000000000..915ecdca2 --- /dev/null +++ b/graphics/misc/trainer_card.png diff --git a/graphics/misc/trainer_card_0star.pal b/graphics/misc/trainer_card_0star.pal new file mode 100644 index 000000000..f49b7f2c5 --- /dev/null +++ b/graphics/misc/trainer_card_0star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 255 255 +230 255 222 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +180 230 156 +148 238 131 +131 222 115 +82 172 74 +106 189 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 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/misc/trainer_card_1star.pal b/graphics/misc/trainer_card_1star.pal new file mode 100644 index 000000000..62c51c91f --- /dev/null +++ b/graphics/misc/trainer_card_1star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +238 255 246 +213 238 230 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +189 213 205 +148 180 164 +106 148 123 +65 115 90 +106 189 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 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/misc/trainer_card_2star.pal b/graphics/misc/trainer_card_2star.pal new file mode 100644 index 000000000..bacce54f5 --- /dev/null +++ b/graphics/misc/trainer_card_2star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 246 230 +246 230 213 +205 156 90 +180 131 65 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +230 189 139 +205 156 115 +180 131 82 +156 106 41 +106 189 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 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/misc/trainer_card_3star.pal b/graphics/misc/trainer_card_3star.pal new file mode 100644 index 000000000..21f3d83eb --- /dev/null +++ b/graphics/misc/trainer_card_3star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 255 +230 230 238 +189 189 197 +156 156 156 +156 106 41 +41 57 65 +57 106 139 +65 139 197 +230 230 238 +189 189 197 +156 156 156 +123 123 123 +106 189 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 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/misc/trainer_card_4star.pal b/graphics/misc/trainer_card_4star.pal new file mode 100644 index 000000000..4e1d56b54 --- /dev/null +++ b/graphics/misc/trainer_card_4star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +246 246 222 +246 238 172 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +246 230 139 +230 213 49 +213 197 57 +156 115 57 +106 189 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 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 |
