diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /graphics | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'graphics')
56 files changed, 153 insertions, 0 deletions
diff --git a/graphics/battle_anims/unk_83E4874.bin b/graphics/battle_anims/unk_83E4874.bin Binary files differnew file mode 100644 index 000000000..dc2990b0a --- /dev/null +++ b/graphics/battle_anims/unk_83E4874.bin diff --git a/graphics/battle_anims/unk_83E4874.png b/graphics/battle_anims/unk_83E4874.png Binary files differnew file mode 100644 index 000000000..c4a27b929 --- /dev/null +++ b/graphics/battle_anims/unk_83E4874.png diff --git a/graphics/evolution_scene/bg.bin b/graphics/evolution_scene/bg.bin Binary files differnew file mode 100644 index 000000000..583ebac2b --- /dev/null +++ b/graphics/evolution_scene/bg.bin diff --git a/graphics/evolution_scene/bg.png b/graphics/evolution_scene/bg.png Binary files differnew file mode 100644 index 000000000..c9e84c58e --- /dev/null +++ b/graphics/evolution_scene/bg.png diff --git a/graphics/evolution_scene/bg2.bin b/graphics/evolution_scene/bg2.bin Binary files differnew file mode 100644 index 000000000..7afab112a --- /dev/null +++ b/graphics/evolution_scene/bg2.bin diff --git a/graphics/evolution_scene/gray_transition_intro.pal b/graphics/evolution_scene/gray_transition_intro.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/evolution_scene/gray_transition_intro.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 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/evolution_scene/transition.pal b/graphics/evolution_scene/transition.pal new file mode 100644 index 000000000..b0f4d3815 --- /dev/null +++ b/graphics/evolution_scene/transition.pal @@ -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 diff --git a/graphics/evolution_scene/unknown_5B4114.pal b/graphics/evolution_scene/unknown_5B4114.pal new file mode 100644 index 000000000..2cd4981fd --- /dev/null +++ b/graphics/evolution_scene/unknown_5B4114.pal @@ -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 diff --git a/graphics/evolution_scene/unref_83F7D80.bin b/graphics/evolution_scene/unref_83F7D80.bin Binary files differnew file mode 100644 index 000000000..b2b300184 --- /dev/null +++ b/graphics/evolution_scene/unref_83F7D80.bin diff --git a/graphics/field_effects/flash_black.pal b/graphics/field_effects/flash_black.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/field_effects/flash_black.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 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/field_effects/flash_effect_map.bin b/graphics/field_effects/flash_effect_map.bin Binary files differnew file mode 100644 index 000000000..4293bfd1c --- /dev/null +++ b/graphics/field_effects/flash_effect_map.bin diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png Binary files differnew file mode 100644 index 000000000..4079a5a84 --- /dev/null +++ b/graphics/field_effects/flash_effect_tiles.png diff --git a/graphics/field_effects/flash_gradient.pal b/graphics/field_effects/flash_gradient.pal new file mode 100644 index 000000000..ec7a2b50e --- /dev/null +++ b/graphics/field_effects/flash_gradient.pal @@ -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 diff --git a/graphics/field_effects/flash_white.pal b/graphics/field_effects/flash_white.pal new file mode 100644 index 000000000..98a1fb3c8 --- /dev/null +++ b/graphics/field_effects/flash_white.pal @@ -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 diff --git a/graphics/map_objects/unk_835B988.pal b/graphics/map_objects/unk_835B988.pal new file mode 100644 index 000000000..27436be92 --- /dev/null +++ b/graphics/map_objects/unk_835B988.pal @@ -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 diff --git a/graphics/misc/evolution_sprite_841EEA4.png b/graphics/misc/evolution_sprite_841EEA4.png Binary files differnew file mode 100644 index 000000000..c942e5b4f --- /dev/null +++ b/graphics/misc/evolution_sprite_841EEA4.png diff --git a/graphics/tileset_anims/anim_0_0.bin b/graphics/tileset_anims/anim_0_0.bin Binary files differnew file mode 100644 index 000000000..38ac085bd --- /dev/null +++ b/graphics/tileset_anims/anim_0_0.bin diff --git a/graphics/tileset_anims/anim_0_1.bin b/graphics/tileset_anims/anim_0_1.bin Binary files differnew file mode 100644 index 000000000..286411540 --- /dev/null +++ b/graphics/tileset_anims/anim_0_1.bin diff --git a/graphics/tileset_anims/anim_0_2.bin b/graphics/tileset_anims/anim_0_2.bin Binary files differnew file mode 100644 index 000000000..8bfe63cd2 --- /dev/null +++ b/graphics/tileset_anims/anim_0_2.bin diff --git a/graphics/tileset_anims/anim_0_3.bin b/graphics/tileset_anims/anim_0_3.bin Binary files differnew file mode 100644 index 000000000..13522349b --- /dev/null +++ b/graphics/tileset_anims/anim_0_3.bin diff --git a/graphics/tileset_anims/anim_0_4.bin b/graphics/tileset_anims/anim_0_4.bin Binary files differnew file mode 100644 index 000000000..8ef77c561 --- /dev/null +++ b/graphics/tileset_anims/anim_0_4.bin diff --git a/graphics/tileset_anims/anim_1_0.bin b/graphics/tileset_anims/anim_1_0.bin Binary files differnew file mode 100644 index 000000000..fb05bd03c --- /dev/null +++ b/graphics/tileset_anims/anim_1_0.bin diff --git a/graphics/tileset_anims/anim_1_1.bin b/graphics/tileset_anims/anim_1_1.bin Binary files differnew file mode 100644 index 000000000..d67987eca --- /dev/null +++ b/graphics/tileset_anims/anim_1_1.bin diff --git a/graphics/tileset_anims/anim_1_2.bin b/graphics/tileset_anims/anim_1_2.bin Binary files differnew file mode 100644 index 000000000..813f93914 --- /dev/null +++ b/graphics/tileset_anims/anim_1_2.bin diff --git a/graphics/tileset_anims/anim_1_3.bin b/graphics/tileset_anims/anim_1_3.bin Binary files differnew file mode 100644 index 000000000..df560357c --- /dev/null +++ b/graphics/tileset_anims/anim_1_3.bin diff --git a/graphics/tileset_anims/anim_1_4.bin b/graphics/tileset_anims/anim_1_4.bin Binary files differnew file mode 100644 index 000000000..d5d005d28 --- /dev/null +++ b/graphics/tileset_anims/anim_1_4.bin diff --git a/graphics/tileset_anims/anim_1_5.bin b/graphics/tileset_anims/anim_1_5.bin Binary files differnew file mode 100644 index 000000000..4e5e0e247 --- /dev/null +++ b/graphics/tileset_anims/anim_1_5.bin diff --git a/graphics/tileset_anims/anim_1_6.bin b/graphics/tileset_anims/anim_1_6.bin Binary files differnew file mode 100644 index 000000000..bb716829f --- /dev/null +++ b/graphics/tileset_anims/anim_1_6.bin diff --git a/graphics/tileset_anims/anim_1_7.bin b/graphics/tileset_anims/anim_1_7.bin Binary files differnew file mode 100644 index 000000000..c49e57e7f --- /dev/null +++ b/graphics/tileset_anims/anim_1_7.bin diff --git a/graphics/tileset_anims/anim_2_0.bin b/graphics/tileset_anims/anim_2_0.bin Binary files differnew file mode 100644 index 000000000..e9225fe58 --- /dev/null +++ b/graphics/tileset_anims/anim_2_0.bin diff --git a/graphics/tileset_anims/anim_2_1.bin b/graphics/tileset_anims/anim_2_1.bin Binary files differnew file mode 100644 index 000000000..74424fff9 --- /dev/null +++ b/graphics/tileset_anims/anim_2_1.bin diff --git a/graphics/tileset_anims/anim_2_2.bin b/graphics/tileset_anims/anim_2_2.bin Binary files differnew file mode 100644 index 000000000..7b2e609c3 --- /dev/null +++ b/graphics/tileset_anims/anim_2_2.bin diff --git a/graphics/tileset_anims/anim_2_3.bin b/graphics/tileset_anims/anim_2_3.bin Binary files differnew file mode 100644 index 000000000..85db3d2df --- /dev/null +++ b/graphics/tileset_anims/anim_2_3.bin diff --git a/graphics/tileset_anims/anim_2_4.bin b/graphics/tileset_anims/anim_2_4.bin Binary files differnew file mode 100644 index 000000000..c350f70ec --- /dev/null +++ b/graphics/tileset_anims/anim_2_4.bin diff --git a/graphics/tileset_anims/anim_2_5.bin b/graphics/tileset_anims/anim_2_5.bin Binary files differnew file mode 100644 index 000000000..71636ac22 --- /dev/null +++ b/graphics/tileset_anims/anim_2_5.bin diff --git a/graphics/tileset_anims/anim_2_6.bin b/graphics/tileset_anims/anim_2_6.bin Binary files differnew file mode 100644 index 000000000..79e125e62 --- /dev/null +++ b/graphics/tileset_anims/anim_2_6.bin diff --git a/graphics/tileset_anims/anim_2_7.bin b/graphics/tileset_anims/anim_2_7.bin Binary files differnew file mode 100644 index 000000000..1df096dbc --- /dev/null +++ b/graphics/tileset_anims/anim_2_7.bin diff --git a/graphics/tileset_anims/anim_3_0.bin b/graphics/tileset_anims/anim_3_0.bin Binary files differnew file mode 100644 index 000000000..6a911444b --- /dev/null +++ b/graphics/tileset_anims/anim_3_0.bin diff --git a/graphics/tileset_anims/anim_3_1.bin b/graphics/tileset_anims/anim_3_1.bin Binary files differnew file mode 100644 index 000000000..a66f3382d --- /dev/null +++ b/graphics/tileset_anims/anim_3_1.bin diff --git a/graphics/tileset_anims/anim_3_2.bin b/graphics/tileset_anims/anim_3_2.bin Binary files differnew file mode 100644 index 000000000..ed7890e83 --- /dev/null +++ b/graphics/tileset_anims/anim_3_2.bin diff --git a/graphics/tileset_anims/anim_3_3.bin b/graphics/tileset_anims/anim_3_3.bin Binary files differnew file mode 100644 index 000000000..5cfdc3ebd --- /dev/null +++ b/graphics/tileset_anims/anim_3_3.bin diff --git a/graphics/tileset_anims/anim_3_4.bin b/graphics/tileset_anims/anim_3_4.bin Binary files differnew file mode 100644 index 000000000..83dc605ff --- /dev/null +++ b/graphics/tileset_anims/anim_3_4.bin diff --git a/graphics/tileset_anims/anim_4_0.bin b/graphics/tileset_anims/anim_4_0.bin new file mode 100644 index 000000000..462cf8168 --- /dev/null +++ b/graphics/tileset_anims/anim_4_0.bin @@ -0,0 +1 @@ +îîîîîïîîïîîîÝݽûÝýú¿Ýÿ»ýú¿Ïÿ¿Ïîîîîîîîþîîþî¿ÛÝÝû¯ßÝ»ÿÚÝüû¯ßüûÿÚÿÿ»ºÿÿÿµûÿÿ¥ûÿ»ª»»ª]ª«ZÝ]ªºÝ½Uû»ÿÿÚÿÿÿ«ÿÿ¿[»ÿ¿Zª»»ª¥ºªÕ«ªÕÝ¿UÛÝý»ÿݽÿÿÚ½¿ûݽ»»Ýý»¿ÝýÿÿÝýÿÿݽÿÿÿ»ßÿÿÛÝ¿ûÛÚ»»ÛÝû»ßÝÿÿßÝÿÿßÝÿÿÛÝݽ¿ûݽ»»ýý»¿ýÝÿÿÝßýÿÝÝÝÝÝÝýÿÝÝÝÝ¿ûÛÝ»»ÛÝû»ßßÿÿÝßÿßýÝÝÝÝÝÿßÝÝÝÝÝÝ
\ No newline at end of file diff --git a/graphics/tileset_anims/anim_4_1.bin b/graphics/tileset_anims/anim_4_1.bin new file mode 100644 index 000000000..eeccebb35 --- /dev/null +++ b/graphics/tileset_anims/anim_4_1.bin @@ -0,0 +1 @@ +îîîîîîîîîîî»ýÝ»¿Ýªÿ»û¿ÿÿûÏýÿûÏîîîîîîîî»îîîû»Ýß»ÿªÝÿû¿Úü¿ÿÚü¿ÿßúÿ¿ÿºÿÿ»µûÿÿ]ûÿ»]»»ªÝUµªÚº¯ªÝ½ÿ[ÿûÿ¯»ÿÿ«ÿÿ¿[»ÿ¿Õª»»Õª[Uݪú«µÿÛÝݽ¿ûݺ»»Ýý»¿ÝýÿÿÝýÿÿݽÿÿݽ¿ûݽ»»¿û«Ý»»ÛÝû»ßÝÿÿßÝÿÿßÿÿÛÝ¿ûÛÝ»»ÛÝÝý»¿ÝýÿÿßýÿÿßÝÿÿýÝýÿÝÝÝÝÝýÝÝÝÝÿÿû»ßÝÿÿßÝÿÿßýÿÿÝýÿßÝßÝÝÝÝÝÝßÝÿÿÝÝ
\ No newline at end of file diff --git a/graphics/tileset_anims/anim_4_2.bin b/graphics/tileset_anims/anim_4_2.bin new file mode 100644 index 000000000..3808d0b82 --- /dev/null +++ b/graphics/tileset_anims/anim_4_2.bin @@ -0,0 +1 @@ +îîîîîï¾ûïþú¿ÝÿÿýúÿÏ¿ÿÏ¿ÿÿ½ÿûÿîîîî¿ëþîû¯ïþÿÿÚÝüÿ¯ßüÿûÚÿÿûÚÿ¿ÿ«ºû¿»¥ûÿ»¥»»ªZª«ZÝ]ªºÝ½U»Ý½ÿ»Ý½»»»û¿[»ÿ¿Zª»»ª¥ºªÕ«ªÕÝ»UÛÝ¿ûÛÝ»»ÛÝý»¿ÝýÿÿÚýÿÿÝýÿÿݽÿÿݽ¿ûݽ»»Ýý»¿û»ßÿÿßÝÿÿßÚÿÿßÝÿÿÛÝ¿ûÛÝ»»ÛÝû»ßÝÝýÿÿÝýÿÿݽÿÿÝÝ»ûÝݽ»ÝÝÝÝÝÝÝÝÝÝÝÝÿÿßÝÿÿßÝÿÿÛÝ¿»ÝÝ»ÛÝÝÝÝÝÝÝÝÝÝÝÝÝÝ
\ No newline at end of file diff --git a/graphics/tileset_anims/anim_4_3.bin b/graphics/tileset_anims/anim_4_3.bin new file mode 100644 index 000000000..45374b4aa --- /dev/null +++ b/graphics/tileset_anims/anim_4_3.bin @@ -0,0 +1 @@ +îîîîîîîîîîî»ýÝ»¿Ýªÿ»û¿ÿÿûÏýÿûÏîîîîîîîî»îîîû»Ýß»ÿªÝÿû¿Úü¿ÿÚü¿ÿßúÿ¿ÿºÿÿ»µûÿÿ]ûÿ»]»»ªÝUµªÚº¯ªÝ½ÿ[ÿûÿ¯»ÿÿ«ÿÿ¿[»ÿ¿Õª»»Õª[Uݪú«µÿÛÝÝýÿÿÝúÿÿݽÿÿݽ¿ûݽ»»Ýý»¿ÝýÿÿÝýÿÿÿÿ¯ÝÿÿßÝÿÿÛÝ¿ûÛ»»ÛÝû»ßÝÿÿßÝÿÿßÝݽÿÿݽ¿ûݽ»»ÝÝ»¿ÝÝýÿÝÝÝÝÝÝÝÝÝÝÝÝÿÿÛÝ¿ûÛÝ»»ÛÝû»ÝÝÿßÝÝÝÝÝÝÝÝÝÝÝÝÝÝ
\ No newline at end of file diff --git a/graphics/tileset_anims/anim_5_0.bin b/graphics/tileset_anims/anim_5_0.bin Binary files differnew file mode 100644 index 000000000..face13a75 --- /dev/null +++ b/graphics/tileset_anims/anim_5_0.bin diff --git a/graphics/tileset_anims/anim_5_1.bin b/graphics/tileset_anims/anim_5_1.bin Binary files differnew file mode 100644 index 000000000..f1a93897e --- /dev/null +++ b/graphics/tileset_anims/anim_5_1.bin diff --git a/graphics/tileset_anims/anim_5_2.bin b/graphics/tileset_anims/anim_5_2.bin Binary files differnew file mode 100644 index 000000000..d63cdc5fc --- /dev/null +++ b/graphics/tileset_anims/anim_5_2.bin diff --git a/graphics/tileset_anims/anim_5_3.bin b/graphics/tileset_anims/anim_5_3.bin Binary files differnew file mode 100644 index 000000000..0c396ccbe --- /dev/null +++ b/graphics/tileset_anims/anim_5_3.bin diff --git a/graphics/tileset_anims/anim_6_0.bin b/graphics/tileset_anims/anim_6_0.bin Binary files differnew file mode 100644 index 000000000..8bdac939e --- /dev/null +++ b/graphics/tileset_anims/anim_6_0.bin diff --git a/graphics/tileset_anims/anim_6_1.bin b/graphics/tileset_anims/anim_6_1.bin Binary files differnew file mode 100644 index 000000000..cd2e32723 --- /dev/null +++ b/graphics/tileset_anims/anim_6_1.bin diff --git a/graphics/tileset_anims/anim_7_0.bin b/graphics/tileset_anims/anim_7_0.bin Binary files differnew file mode 100644 index 000000000..f94617c73 --- /dev/null +++ b/graphics/tileset_anims/anim_7_0.bin diff --git a/graphics/tileset_anims/anim_7_1.bin b/graphics/tileset_anims/anim_7_1.bin Binary files differnew file mode 100644 index 000000000..ac59368ca --- /dev/null +++ b/graphics/tileset_anims/anim_7_1.bin diff --git a/graphics/tileset_anims/anim_7_2.bin b/graphics/tileset_anims/anim_7_2.bin Binary files differnew file mode 100644 index 000000000..9dd915040 --- /dev/null +++ b/graphics/tileset_anims/anim_7_2.bin diff --git a/graphics/unknown/unk_841EF48.png b/graphics/unknown/unk_841EF48.png Binary files differnew file mode 100644 index 000000000..a61833c0a --- /dev/null +++ b/graphics/unknown/unk_841EF48.png |
