diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-04 09:10:09 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-04 09:10:09 -0400 |
| commit | 75ab879fd876d35eac8498296994278e213b6e7a (patch) | |
| tree | b9763615e9771ac5dce777031a80b57b12d9cac2 /graphics | |
| parent | e82080d42bbb81b2add8bef5c073cc353dfea307 (diff) | |
| parent | 2d3210dc1129e3d60a9d138838dc867d8b106b41 (diff) | |
Merge remote-tracking branch 'origin/master' into modern_ld
Diffstat (limited to 'graphics')
46 files changed, 0 insertions, 4 deletions
diff --git a/graphics/link_games/unk_846F058.bin b/graphics/berry_crush/bg.bin Binary files differindex 1967c9f45..1967c9f45 100644 --- a/graphics/link_games/unk_846F058.bin +++ b/graphics/berry_crush/bg.bin diff --git a/graphics/link_games/unk_846EEC0.bin b/graphics/berry_crush/container_cap.bin Binary files differindex 934d95779..934d95779 100644 --- a/graphics/link_games/unk_846EEC0.bin +++ b/graphics/berry_crush/container_cap.bin diff --git a/graphics/link_games/unk_846E4D0.png b/graphics/berry_crush/crusher_base.png Binary files differindex 88659471b..88659471b 100644 --- a/graphics/link_games/unk_846E4D0.png +++ b/graphics/berry_crush/crusher_base.png diff --git a/graphics/link_games/unk_846ED90.bin b/graphics/berry_crush/crusher_top.bin Binary files differindex 79713a661..79713a661 100644 --- a/graphics/link_games/unk_846ED90.bin +++ b/graphics/berry_crush/crusher_top.bin diff --git a/graphics/link_games/unk_846E7FC.png b/graphics/berry_crush/impact.png Binary files differindex 3eaf7db0d..3eaf7db0d 100644 --- a/graphics/link_games/unk_846E7FC.png +++ b/graphics/berry_crush/impact.png diff --git a/graphics/link_games/unk_846EB78.png b/graphics/berry_crush/sparkle.png Binary files differindex 0248f9c93..0248f9c93 100644 --- a/graphics/link_games/unk_846EB78.png +++ b/graphics/berry_crush/sparkle.png diff --git a/graphics/link_games/unk_846ECC4.png b/graphics/berry_crush/timer_digits.png Binary files differindex cfb3e9508..cfb3e9508 100644 --- a/graphics/link_games/unk_846ECC4.png +++ b/graphics/berry_crush/timer_digits.png diff --git a/graphics/tileset_anims/anim_0_0.bin b/graphics/tileset_anims/anim_0_0.bin Binary files differdeleted file mode 100644 index 38ac085bd..000000000 --- a/graphics/tileset_anims/anim_0_0.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_0_1.bin b/graphics/tileset_anims/anim_0_1.bin Binary files differdeleted file mode 100644 index 286411540..000000000 --- a/graphics/tileset_anims/anim_0_1.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_0_2.bin b/graphics/tileset_anims/anim_0_2.bin Binary files differdeleted file mode 100644 index 8bfe63cd2..000000000 --- a/graphics/tileset_anims/anim_0_2.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_0_3.bin b/graphics/tileset_anims/anim_0_3.bin Binary files differdeleted file mode 100644 index 13522349b..000000000 --- a/graphics/tileset_anims/anim_0_3.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_0_4.bin b/graphics/tileset_anims/anim_0_4.bin Binary files differdeleted file mode 100644 index 8ef77c561..000000000 --- a/graphics/tileset_anims/anim_0_4.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_1_0.bin b/graphics/tileset_anims/anim_1_0.bin Binary files differdeleted file mode 100644 index fb05bd03c..000000000 --- a/graphics/tileset_anims/anim_1_0.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_1_1.bin b/graphics/tileset_anims/anim_1_1.bin Binary files differdeleted file mode 100644 index d67987eca..000000000 --- a/graphics/tileset_anims/anim_1_1.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_1_2.bin b/graphics/tileset_anims/anim_1_2.bin Binary files differdeleted file mode 100644 index 813f93914..000000000 --- a/graphics/tileset_anims/anim_1_2.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_1_3.bin b/graphics/tileset_anims/anim_1_3.bin Binary files differdeleted file mode 100644 index df560357c..000000000 --- a/graphics/tileset_anims/anim_1_3.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_1_4.bin b/graphics/tileset_anims/anim_1_4.bin Binary files differdeleted file mode 100644 index d5d005d28..000000000 --- a/graphics/tileset_anims/anim_1_4.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_1_5.bin b/graphics/tileset_anims/anim_1_5.bin Binary files differdeleted file mode 100644 index 4e5e0e247..000000000 --- a/graphics/tileset_anims/anim_1_5.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_1_6.bin b/graphics/tileset_anims/anim_1_6.bin Binary files differdeleted file mode 100644 index bb716829f..000000000 --- a/graphics/tileset_anims/anim_1_6.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_1_7.bin b/graphics/tileset_anims/anim_1_7.bin Binary files differdeleted file mode 100644 index c49e57e7f..000000000 --- a/graphics/tileset_anims/anim_1_7.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_2_0.bin b/graphics/tileset_anims/anim_2_0.bin Binary files differdeleted file mode 100644 index e9225fe58..000000000 --- a/graphics/tileset_anims/anim_2_0.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_2_1.bin b/graphics/tileset_anims/anim_2_1.bin Binary files differdeleted file mode 100644 index 74424fff9..000000000 --- a/graphics/tileset_anims/anim_2_1.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_2_2.bin b/graphics/tileset_anims/anim_2_2.bin Binary files differdeleted file mode 100644 index 7b2e609c3..000000000 --- a/graphics/tileset_anims/anim_2_2.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_2_3.bin b/graphics/tileset_anims/anim_2_3.bin Binary files differdeleted file mode 100644 index 85db3d2df..000000000 --- a/graphics/tileset_anims/anim_2_3.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_2_4.bin b/graphics/tileset_anims/anim_2_4.bin Binary files differdeleted file mode 100644 index c350f70ec..000000000 --- a/graphics/tileset_anims/anim_2_4.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_2_5.bin b/graphics/tileset_anims/anim_2_5.bin Binary files differdeleted file mode 100644 index 71636ac22..000000000 --- a/graphics/tileset_anims/anim_2_5.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_2_6.bin b/graphics/tileset_anims/anim_2_6.bin Binary files differdeleted file mode 100644 index 79e125e62..000000000 --- a/graphics/tileset_anims/anim_2_6.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_2_7.bin b/graphics/tileset_anims/anim_2_7.bin Binary files differdeleted file mode 100644 index 1df096dbc..000000000 --- a/graphics/tileset_anims/anim_2_7.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_3_0.bin b/graphics/tileset_anims/anim_3_0.bin Binary files differdeleted file mode 100644 index 6a911444b..000000000 --- a/graphics/tileset_anims/anim_3_0.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_3_1.bin b/graphics/tileset_anims/anim_3_1.bin Binary files differdeleted file mode 100644 index a66f3382d..000000000 --- a/graphics/tileset_anims/anim_3_1.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_3_2.bin b/graphics/tileset_anims/anim_3_2.bin Binary files differdeleted file mode 100644 index ed7890e83..000000000 --- a/graphics/tileset_anims/anim_3_2.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_3_3.bin b/graphics/tileset_anims/anim_3_3.bin Binary files differdeleted file mode 100644 index 5cfdc3ebd..000000000 --- a/graphics/tileset_anims/anim_3_3.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_3_4.bin b/graphics/tileset_anims/anim_3_4.bin Binary files differdeleted file mode 100644 index 83dc605ff..000000000 --- a/graphics/tileset_anims/anim_3_4.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_4_0.bin b/graphics/tileset_anims/anim_4_0.bin deleted file mode 100644 index 462cf8168..000000000 --- a/graphics/tileset_anims/anim_4_0.bin +++ /dev/null @@ -1 +0,0 @@ -îîîîîïîîïîîîÝݽûÝýú¿Ýÿ»ýú¿Ïÿ¿Ïîîîîîîîþîîþî¿ÛÝÝû¯ßÝ»ÿÚÝüû¯ßüûÿÚÿÿ»ºÿÿÿµûÿÿ¥ûÿ»ª»»ª]ª«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 deleted file mode 100644 index eeccebb35..000000000 --- a/graphics/tileset_anims/anim_4_1.bin +++ /dev/null @@ -1 +0,0 @@ -îîîîîîîîîîî»ýÝ»¿Ýªÿ»û¿ÿÿûÏýÿûÏîîîîîîîî»îîîû»Ýß»ÿªÝÿû¿Úü¿ÿÚü¿ÿßúÿ¿ÿºÿÿ»µûÿÿ]ûÿ»]»»ªÝ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 deleted file mode 100644 index 3808d0b82..000000000 --- a/graphics/tileset_anims/anim_4_2.bin +++ /dev/null @@ -1 +0,0 @@ -îîîîîï¾ûïþú¿ÝÿÿýúÿÏ¿ÿÏ¿ÿÿ½ÿûÿîîîî¿ëþîû¯ïþÿÿÚÝüÿ¯ßüÿûÚÿÿûÚÿ¿ÿ«ºû¿»¥ûÿ»¥»»ª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 deleted file mode 100644 index 45374b4aa..000000000 --- a/graphics/tileset_anims/anim_4_3.bin +++ /dev/null @@ -1 +0,0 @@ -îîîîîîîîîîî»ýÝ»¿Ýªÿ»û¿ÿÿûÏýÿûÏîîîîîîîî»îîîû»Ýß»ÿªÝÿû¿Úü¿ÿÚü¿ÿßúÿ¿ÿºÿÿ»µûÿÿ]ûÿ»]»»ªÝ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 differdeleted file mode 100644 index face13a75..000000000 --- a/graphics/tileset_anims/anim_5_0.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_5_1.bin b/graphics/tileset_anims/anim_5_1.bin Binary files differdeleted file mode 100644 index f1a93897e..000000000 --- a/graphics/tileset_anims/anim_5_1.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_5_2.bin b/graphics/tileset_anims/anim_5_2.bin Binary files differdeleted file mode 100644 index d63cdc5fc..000000000 --- a/graphics/tileset_anims/anim_5_2.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_5_3.bin b/graphics/tileset_anims/anim_5_3.bin Binary files differdeleted file mode 100644 index 0c396ccbe..000000000 --- a/graphics/tileset_anims/anim_5_3.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_6_0.bin b/graphics/tileset_anims/anim_6_0.bin Binary files differdeleted file mode 100644 index 8bdac939e..000000000 --- a/graphics/tileset_anims/anim_6_0.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_6_1.bin b/graphics/tileset_anims/anim_6_1.bin Binary files differdeleted file mode 100644 index cd2e32723..000000000 --- a/graphics/tileset_anims/anim_6_1.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_7_0.bin b/graphics/tileset_anims/anim_7_0.bin Binary files differdeleted file mode 100644 index f94617c73..000000000 --- a/graphics/tileset_anims/anim_7_0.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_7_1.bin b/graphics/tileset_anims/anim_7_1.bin Binary files differdeleted file mode 100644 index ac59368ca..000000000 --- a/graphics/tileset_anims/anim_7_1.bin +++ /dev/null diff --git a/graphics/tileset_anims/anim_7_2.bin b/graphics/tileset_anims/anim_7_2.bin Binary files differdeleted file mode 100644 index 9dd915040..000000000 --- a/graphics/tileset_anims/anim_7_2.bin +++ /dev/null |
