From 5142c037b60ba876c2ea42555a7e102bd4c60625 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 09:29:07 -0500 Subject: Dump tileset anims data --- baserom.ips | Bin 270923 -> 249030 bytes data/tileset_anims.s | 26 -------- graphics/tileset_anims/aim_0_0.bin | Bin 0 -> 128 bytes graphics/tileset_anims/aim_0_1.bin | Bin 0 -> 128 bytes graphics/tileset_anims/aim_0_2.bin | Bin 0 -> 128 bytes graphics/tileset_anims/aim_0_3.bin | Bin 0 -> 128 bytes graphics/tileset_anims/aim_0_4.bin | Bin 0 -> 128 bytes graphics/tileset_anims/aim_1_0.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/aim_1_1.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/aim_1_2.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/aim_1_3.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/aim_1_4.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/aim_1_5.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/aim_1_6.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/aim_1_7.bin | Bin 0 -> 1504 bytes graphics/tileset_anims/aim_2_0.bin | Bin 0 -> 576 bytes graphics/tileset_anims/aim_2_1.bin | Bin 0 -> 576 bytes graphics/tileset_anims/aim_2_2.bin | Bin 0 -> 576 bytes graphics/tileset_anims/aim_2_3.bin | Bin 0 -> 576 bytes graphics/tileset_anims/aim_2_4.bin | Bin 0 -> 576 bytes graphics/tileset_anims/aim_2_5.bin | Bin 0 -> 576 bytes graphics/tileset_anims/aim_2_6.bin | Bin 0 -> 576 bytes graphics/tileset_anims/aim_2_7.bin | Bin 0 -> 576 bytes graphics/tileset_anims/aim_3_0.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_3_1.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_3_2.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_3_3.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_3_4.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_4_0.bin | 1 + graphics/tileset_anims/aim_4_1.bin | 1 + graphics/tileset_anims/aim_4_2.bin | 1 + graphics/tileset_anims/aim_4_3.bin | 1 + graphics/tileset_anims/aim_5_0.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_5_1.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_5_2.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_5_3.bin | Bin 0 -> 256 bytes graphics/tileset_anims/aim_6_0.bin | Bin 0 -> 224 bytes graphics/tileset_anims/aim_6_1.bin | Bin 0 -> 224 bytes graphics/tileset_anims/aim_7_0.bin | Bin 0 -> 128 bytes graphics/tileset_anims/aim_7_1.bin | Bin 0 -> 128 bytes graphics/tileset_anims/aim_7_2.bin | Bin 0 -> 128 bytes ld_script.txt | 2 +- src/tileset_anims.c | 120 ++++++++++++++++++++++++++++++++++--- 43 files changed, 117 insertions(+), 35 deletions(-) create mode 100644 graphics/tileset_anims/aim_0_0.bin create mode 100644 graphics/tileset_anims/aim_0_1.bin create mode 100644 graphics/tileset_anims/aim_0_2.bin create mode 100644 graphics/tileset_anims/aim_0_3.bin create mode 100644 graphics/tileset_anims/aim_0_4.bin create mode 100644 graphics/tileset_anims/aim_1_0.bin create mode 100644 graphics/tileset_anims/aim_1_1.bin create mode 100644 graphics/tileset_anims/aim_1_2.bin create mode 100644 graphics/tileset_anims/aim_1_3.bin create mode 100644 graphics/tileset_anims/aim_1_4.bin create mode 100644 graphics/tileset_anims/aim_1_5.bin create mode 100644 graphics/tileset_anims/aim_1_6.bin create mode 100644 graphics/tileset_anims/aim_1_7.bin create mode 100644 graphics/tileset_anims/aim_2_0.bin create mode 100644 graphics/tileset_anims/aim_2_1.bin create mode 100644 graphics/tileset_anims/aim_2_2.bin create mode 100644 graphics/tileset_anims/aim_2_3.bin create mode 100644 graphics/tileset_anims/aim_2_4.bin create mode 100644 graphics/tileset_anims/aim_2_5.bin create mode 100644 graphics/tileset_anims/aim_2_6.bin create mode 100644 graphics/tileset_anims/aim_2_7.bin create mode 100644 graphics/tileset_anims/aim_3_0.bin create mode 100644 graphics/tileset_anims/aim_3_1.bin create mode 100644 graphics/tileset_anims/aim_3_2.bin create mode 100644 graphics/tileset_anims/aim_3_3.bin create mode 100644 graphics/tileset_anims/aim_3_4.bin create mode 100644 graphics/tileset_anims/aim_4_0.bin create mode 100644 graphics/tileset_anims/aim_4_1.bin create mode 100644 graphics/tileset_anims/aim_4_2.bin create mode 100644 graphics/tileset_anims/aim_4_3.bin create mode 100644 graphics/tileset_anims/aim_5_0.bin create mode 100644 graphics/tileset_anims/aim_5_1.bin create mode 100644 graphics/tileset_anims/aim_5_2.bin create mode 100644 graphics/tileset_anims/aim_5_3.bin create mode 100644 graphics/tileset_anims/aim_6_0.bin create mode 100644 graphics/tileset_anims/aim_6_1.bin create mode 100644 graphics/tileset_anims/aim_7_0.bin create mode 100644 graphics/tileset_anims/aim_7_1.bin create mode 100644 graphics/tileset_anims/aim_7_2.bin diff --git a/baserom.ips b/baserom.ips index bde26c658..78355b3e8 100644 Binary files a/baserom.ips and b/baserom.ips differ diff --git a/data/tileset_anims.s b/data/tileset_anims.s index 5f2320fd3..bd9a27175 100644 --- a/data/tileset_anims.s +++ b/data/tileset_anims.s @@ -1,28 +1,2 @@ .section .rodata .align 2 -gUnknown_83A73E0:: @ 83A73E0 - .incbin "baserom.gba", 0x3A73E0, 0x280 - -gUnknown_83A7660:: @ 83A7660 - .incbin "baserom.gba", 0x3A7660, 0x2FF4 - -gUnknown_83AA654:: @ 83AA654 - .incbin "baserom.gba", 0x3AA654, 0x1220 - -gUnknown_83AB874:: @ 83AB874 - .incbin "baserom.gba", 0x3AB874, 0x540 - -gUnknown_83ABDB4:: @ 83ABDB4 - .incbin "baserom.gba", 0x3ABDB4, 0x434 - -gUnknown_83AC1E8:: @ 83AC1E8 - .incbin "baserom.gba", 0x3AC1E8, 0x410 - -gUnknown_83AC5F8:: @ 83AC5F8 - .incbin "baserom.gba", 0x3AC5F8, 0x1D0 - -gUnknown_83AC7C8:: @ 83AC7C8 - .incbin "baserom.gba", 0x3AC7C8, 0x188 - -gUnknown_83AC950:: @ 83AC950 - .incbin "baserom.gba", 0x3AC950, 0x10 diff --git a/graphics/tileset_anims/aim_0_0.bin b/graphics/tileset_anims/aim_0_0.bin new file mode 100644 index 000000000..38ac085bd Binary files /dev/null and b/graphics/tileset_anims/aim_0_0.bin differ diff --git a/graphics/tileset_anims/aim_0_1.bin b/graphics/tileset_anims/aim_0_1.bin new file mode 100644 index 000000000..286411540 Binary files /dev/null and b/graphics/tileset_anims/aim_0_1.bin differ diff --git a/graphics/tileset_anims/aim_0_2.bin b/graphics/tileset_anims/aim_0_2.bin new file mode 100644 index 000000000..8bfe63cd2 Binary files /dev/null and b/graphics/tileset_anims/aim_0_2.bin differ diff --git a/graphics/tileset_anims/aim_0_3.bin b/graphics/tileset_anims/aim_0_3.bin new file mode 100644 index 000000000..13522349b Binary files /dev/null and b/graphics/tileset_anims/aim_0_3.bin differ diff --git a/graphics/tileset_anims/aim_0_4.bin b/graphics/tileset_anims/aim_0_4.bin new file mode 100644 index 000000000..8ef77c561 Binary files /dev/null and b/graphics/tileset_anims/aim_0_4.bin differ diff --git a/graphics/tileset_anims/aim_1_0.bin b/graphics/tileset_anims/aim_1_0.bin new file mode 100644 index 000000000..fb05bd03c Binary files /dev/null and b/graphics/tileset_anims/aim_1_0.bin differ diff --git a/graphics/tileset_anims/aim_1_1.bin b/graphics/tileset_anims/aim_1_1.bin new file mode 100644 index 000000000..d67987eca Binary files /dev/null and b/graphics/tileset_anims/aim_1_1.bin differ diff --git a/graphics/tileset_anims/aim_1_2.bin b/graphics/tileset_anims/aim_1_2.bin new file mode 100644 index 000000000..813f93914 Binary files /dev/null and b/graphics/tileset_anims/aim_1_2.bin differ diff --git a/graphics/tileset_anims/aim_1_3.bin b/graphics/tileset_anims/aim_1_3.bin new file mode 100644 index 000000000..df560357c Binary files /dev/null and b/graphics/tileset_anims/aim_1_3.bin differ diff --git a/graphics/tileset_anims/aim_1_4.bin b/graphics/tileset_anims/aim_1_4.bin new file mode 100644 index 000000000..d5d005d28 Binary files /dev/null and b/graphics/tileset_anims/aim_1_4.bin differ diff --git a/graphics/tileset_anims/aim_1_5.bin b/graphics/tileset_anims/aim_1_5.bin new file mode 100644 index 000000000..4e5e0e247 Binary files /dev/null and b/graphics/tileset_anims/aim_1_5.bin differ diff --git a/graphics/tileset_anims/aim_1_6.bin b/graphics/tileset_anims/aim_1_6.bin new file mode 100644 index 000000000..bb716829f Binary files /dev/null and b/graphics/tileset_anims/aim_1_6.bin differ diff --git a/graphics/tileset_anims/aim_1_7.bin b/graphics/tileset_anims/aim_1_7.bin new file mode 100644 index 000000000..c49e57e7f Binary files /dev/null and b/graphics/tileset_anims/aim_1_7.bin differ diff --git a/graphics/tileset_anims/aim_2_0.bin b/graphics/tileset_anims/aim_2_0.bin new file mode 100644 index 000000000..e9225fe58 Binary files /dev/null and b/graphics/tileset_anims/aim_2_0.bin differ diff --git a/graphics/tileset_anims/aim_2_1.bin b/graphics/tileset_anims/aim_2_1.bin new file mode 100644 index 000000000..74424fff9 Binary files /dev/null and b/graphics/tileset_anims/aim_2_1.bin differ diff --git a/graphics/tileset_anims/aim_2_2.bin b/graphics/tileset_anims/aim_2_2.bin new file mode 100644 index 000000000..7b2e609c3 Binary files /dev/null and b/graphics/tileset_anims/aim_2_2.bin differ diff --git a/graphics/tileset_anims/aim_2_3.bin b/graphics/tileset_anims/aim_2_3.bin new file mode 100644 index 000000000..85db3d2df Binary files /dev/null and b/graphics/tileset_anims/aim_2_3.bin differ diff --git a/graphics/tileset_anims/aim_2_4.bin b/graphics/tileset_anims/aim_2_4.bin new file mode 100644 index 000000000..c350f70ec Binary files /dev/null and b/graphics/tileset_anims/aim_2_4.bin differ diff --git a/graphics/tileset_anims/aim_2_5.bin b/graphics/tileset_anims/aim_2_5.bin new file mode 100644 index 000000000..71636ac22 Binary files /dev/null and b/graphics/tileset_anims/aim_2_5.bin differ diff --git a/graphics/tileset_anims/aim_2_6.bin b/graphics/tileset_anims/aim_2_6.bin new file mode 100644 index 000000000..79e125e62 Binary files /dev/null and b/graphics/tileset_anims/aim_2_6.bin differ diff --git a/graphics/tileset_anims/aim_2_7.bin b/graphics/tileset_anims/aim_2_7.bin new file mode 100644 index 000000000..1df096dbc Binary files /dev/null and b/graphics/tileset_anims/aim_2_7.bin differ diff --git a/graphics/tileset_anims/aim_3_0.bin b/graphics/tileset_anims/aim_3_0.bin new file mode 100644 index 000000000..6a911444b Binary files /dev/null and b/graphics/tileset_anims/aim_3_0.bin differ diff --git a/graphics/tileset_anims/aim_3_1.bin b/graphics/tileset_anims/aim_3_1.bin new file mode 100644 index 000000000..a66f3382d Binary files /dev/null and b/graphics/tileset_anims/aim_3_1.bin differ diff --git a/graphics/tileset_anims/aim_3_2.bin b/graphics/tileset_anims/aim_3_2.bin new file mode 100644 index 000000000..ed7890e83 Binary files /dev/null and b/graphics/tileset_anims/aim_3_2.bin differ diff --git a/graphics/tileset_anims/aim_3_3.bin b/graphics/tileset_anims/aim_3_3.bin new file mode 100644 index 000000000..5cfdc3ebd Binary files /dev/null and b/graphics/tileset_anims/aim_3_3.bin differ diff --git a/graphics/tileset_anims/aim_3_4.bin b/graphics/tileset_anims/aim_3_4.bin new file mode 100644 index 000000000..83dc605ff Binary files /dev/null and b/graphics/tileset_anims/aim_3_4.bin differ diff --git a/graphics/tileset_anims/aim_4_0.bin b/graphics/tileset_anims/aim_4_0.bin new file mode 100644 index 000000000..462cf8168 --- /dev/null +++ b/graphics/tileset_anims/aim_4_0.bin @@ -0,0 +1 @@ +îîîîîïîîïîîîÝݽûÝýú¿Ý­ÿ»ýú¿Ï­ÿ¿Ïîîîîîîîþîîþî¿ÛÝÝû¯ßÝ»ÿÚÝüû¯ßüûÿÚ­ÿÿ»ºÿÿÿµûÿÿ¥ûÿ»ª»»ª]ª«ZÝ]ªºÝ½Uû»ÿÿÚÿÿÿ«ÿÿ¿[»ÿ¿Zª»»ª¥ºªÕ«ªÕÝ¿UÛÝ­ý»ÿݽÿÿÚ½¿ûݽ»»Ýý»¿ÝýÿÿÝýÿÿݽÿÿÿ»ß­ÿÿÛÝ¿ûÛÚ»»ÛÝû»ßÝÿÿßÝÿÿßÝÿÿÛÝݽ¿ûݽ»»ýý»¿ýÝÿÿÝßýÿÝÝÝÝÝÝýÿÝÝÝÝ¿ûÛÝ»»ÛÝû»ßßÿÿÝßÿßýÝÝÝÝÝÿßÝÝÝÝÝÝ \ No newline at end of file diff --git a/graphics/tileset_anims/aim_4_1.bin b/graphics/tileset_anims/aim_4_1.bin new file mode 100644 index 000000000..eeccebb35 --- /dev/null +++ b/graphics/tileset_anims/aim_4_1.bin @@ -0,0 +1 @@ +îîîîîîîîîîî»ýÝ»¿Ýªÿ»­û¿ÿ­ÿûÏýÿûÏîîîîîîîî»îîîû»Ýß»ÿªÝÿû¿Úü¿ÿÚü¿ÿßúÿ¿ÿºÿÿ»µûÿÿ]ûÿ»]»»ªÝUµªÚº¯ªÝ½ÿ[ÿûÿ¯»ÿÿ«ÿÿ¿[»ÿ¿Õª»»Õª[Uݪú«­µÿÛÝݽ¿ûݺ»»Ýý»¿ÝýÿÿÝýÿÿݽÿÿݽ¿ûݽ»»¿û«Ý»»ÛÝû»ßÝÿÿßÝÿÿß­ÿÿÛÝ¿ûÛÝ»»ÛÝÝý»¿ÝýÿÿßýÿÿßÝÿÿýÝýÿÝÝÝÝÝýÝÝÝÝÿÿû»ßÝÿÿßÝÿÿßýÿÿÝýÿßÝßÝÝÝÝÝÝßÝÿÿÝÝ \ No newline at end of file diff --git a/graphics/tileset_anims/aim_4_2.bin b/graphics/tileset_anims/aim_4_2.bin new file mode 100644 index 000000000..3808d0b82 --- /dev/null +++ b/graphics/tileset_anims/aim_4_2.bin @@ -0,0 +1 @@ +îîîîîï¾ûïþú¿Ý­ÿÿýúÿÏ­¿ÿÏ­¿ÿÿ½ÿûÿîîîî¿ëþîû¯ïþÿÿÚÝüÿ¯ßüÿûÚÿÿûÚÿ¿ÿ«ºû¿»¥ûÿ»¥»»ªZª«ZÝ]ªºÝ½U»Ý½ÿ»Ý½»»»û¿[»ÿ¿Zª»»ª¥ºªÕ«ªÕÝ»UÛÝ¿ûÛÝ»»ÛÝ­ý»¿ÝýÿÿÚýÿÿÝýÿÿݽÿÿݽ¿ûݽ»»Ýý»¿û»ß­ÿÿßÝÿÿßÚÿÿßÝÿÿÛÝ¿ûÛÝ»»ÛÝû»ßÝÝýÿÿÝýÿÿݽÿÿÝÝ»ûÝݽ»ÝÝÝÝÝÝÝÝÝÝÝÝÿÿßÝÿÿßÝÿÿÛÝ¿»ÝÝ»ÛÝÝÝÝÝÝÝÝÝÝÝÝÝÝ \ No newline at end of file diff --git a/graphics/tileset_anims/aim_4_3.bin b/graphics/tileset_anims/aim_4_3.bin new file mode 100644 index 000000000..45374b4aa --- /dev/null +++ b/graphics/tileset_anims/aim_4_3.bin @@ -0,0 +1 @@ +îîîîîîîîîîî»ýÝ»¿Ýªÿ»­û¿ÿ­ÿûÏýÿûÏîîîîîîîî»îîîû»Ýß»ÿªÝÿû¿Úü¿ÿÚü¿ÿßúÿ¿ÿºÿÿ»µûÿÿ]ûÿ»]»»ªÝUµªÚº¯ªÝ½ÿ[ÿûÿ¯»ÿÿ«ÿÿ¿[»ÿ¿Õª»»Õª[Uݪú«­µÿÛÝÝýÿÿÝúÿÿݽÿÿݽ¿ûݽ»»Ýý»¿ÝýÿÿÝýÿÿÿÿ¯ÝÿÿßÝÿÿÛÝ¿ûÛ­»»ÛÝû»ßÝÿÿßÝÿÿßÝݽÿÿݽ¿ûݽ»»ÝÝ»¿ÝÝýÿÝÝÝÝÝÝÝÝÝÝÝÝÿÿÛÝ¿ûÛÝ»»ÛÝû»ÝÝÿßÝÝÝÝÝÝÝÝÝÝÝÝÝÝ \ No newline at end of file diff --git a/graphics/tileset_anims/aim_5_0.bin b/graphics/tileset_anims/aim_5_0.bin new file mode 100644 index 000000000..face13a75 Binary files /dev/null and b/graphics/tileset_anims/aim_5_0.bin differ diff --git a/graphics/tileset_anims/aim_5_1.bin b/graphics/tileset_anims/aim_5_1.bin new file mode 100644 index 000000000..f1a93897e Binary files /dev/null and b/graphics/tileset_anims/aim_5_1.bin differ diff --git a/graphics/tileset_anims/aim_5_2.bin b/graphics/tileset_anims/aim_5_2.bin new file mode 100644 index 000000000..d63cdc5fc Binary files /dev/null and b/graphics/tileset_anims/aim_5_2.bin differ diff --git a/graphics/tileset_anims/aim_5_3.bin b/graphics/tileset_anims/aim_5_3.bin new file mode 100644 index 000000000..0c396ccbe Binary files /dev/null and b/graphics/tileset_anims/aim_5_3.bin differ diff --git a/graphics/tileset_anims/aim_6_0.bin b/graphics/tileset_anims/aim_6_0.bin new file mode 100644 index 000000000..8bdac939e Binary files /dev/null and b/graphics/tileset_anims/aim_6_0.bin differ diff --git a/graphics/tileset_anims/aim_6_1.bin b/graphics/tileset_anims/aim_6_1.bin new file mode 100644 index 000000000..cd2e32723 Binary files /dev/null and b/graphics/tileset_anims/aim_6_1.bin differ diff --git a/graphics/tileset_anims/aim_7_0.bin b/graphics/tileset_anims/aim_7_0.bin new file mode 100644 index 000000000..f94617c73 Binary files /dev/null and b/graphics/tileset_anims/aim_7_0.bin differ diff --git a/graphics/tileset_anims/aim_7_1.bin b/graphics/tileset_anims/aim_7_1.bin new file mode 100644 index 000000000..ac59368ca Binary files /dev/null and b/graphics/tileset_anims/aim_7_1.bin differ diff --git a/graphics/tileset_anims/aim_7_2.bin b/graphics/tileset_anims/aim_7_2.bin new file mode 100644 index 000000000..9dd915040 Binary files /dev/null and b/graphics/tileset_anims/aim_7_2.bin differ diff --git a/ld_script.txt b/ld_script.txt index 16e7b576c..cb6395393 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -417,7 +417,7 @@ SECTIONS { src/coord_event_weather.o(.rodata); data/field_tasks.o(.rodata); src/start_menu.o(.rodata); - data/tileset_anims.o(.rodata); + src/tileset_anims.o(.rodata); src/palette.o(.rodata); src/sound.o(.rodata); data/battle_anim.o(.rodata); diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 30f390512..9403bc1df 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -23,14 +23,118 @@ static void (*sSecondaryTilesetAnimCallback)(u16); static void _InitPrimaryTilesetAnimation(void); static void _InitSecondaryTilesetAnimation(void); -extern const u16 *const gUnknown_83A7660[]; -extern const u16 *const gUnknown_83AA654[]; -extern const u16 *const gUnknown_83AB874[]; -extern const u16 *const gUnknown_83ABDB4[]; -extern const u16 *const gUnknown_83AC1E8[]; -extern const u16 *const gUnknown_83AC5F8[]; -extern const u16 *const gUnknown_83AC7C8[]; -extern const u16 *const gUnknown_83AC950[]; +static const u16 gUnknown_83A73E0[] = INCBIN_U16("graphics/tileset_anims/aim_0_0.bin"); +static const u16 gUnknown_83A7460[] = INCBIN_U16("graphics/tileset_anims/aim_0_1.bin"); +static const u16 gUnknown_83A74E0[] = INCBIN_U16("graphics/tileset_anims/aim_0_2.bin"); +static const u16 gUnknown_83A7560[] = INCBIN_U16("graphics/tileset_anims/aim_0_3.bin"); +static const u16 gUnknown_83A75E0[] = INCBIN_U16("graphics/tileset_anims/aim_0_4.bin"); + +static const u16 *const gUnknown_83A7660[] = { + gUnknown_83A73E0, + gUnknown_83A7460, + gUnknown_83A74E0, + gUnknown_83A7560, + gUnknown_83A75E0 +}; + +static const u16 gUnknown_83A7674[] = INCBIN_U16("graphics/tileset_anims/aim_1_0.bin"); +static const u16 gUnknown_83A7C74[] = INCBIN_U16("graphics/tileset_anims/aim_1_1.bin"); +static const u16 gUnknown_83A8274[] = INCBIN_U16("graphics/tileset_anims/aim_1_2.bin"); +static const u16 gUnknown_83A8874[] = INCBIN_U16("graphics/tileset_anims/aim_1_3.bin"); +static const u16 gUnknown_83A8E74[] = INCBIN_U16("graphics/tileset_anims/aim_1_4.bin"); +static const u16 gUnknown_83A9474[] = INCBIN_U16("graphics/tileset_anims/aim_1_5.bin"); +static const u16 gUnknown_83A9A74[] = INCBIN_U16("graphics/tileset_anims/aim_1_6.bin"); +static const u16 gUnknown_83AA074[] = INCBIN_U16("graphics/tileset_anims/aim_1_7.bin"); + +static const u16 *const gUnknown_83AA654[] = { + gUnknown_83A7674, + gUnknown_83A7C74, + gUnknown_83A8274, + gUnknown_83A8874, + gUnknown_83A8E74, + gUnknown_83A9474, + gUnknown_83A9A74, + gUnknown_83AA074 +}; + +static const u16 gUnknown_83AA674[] = INCBIN_U16("graphics/tileset_anims/aim_2_0.bin"); +static const u16 gUnknown_83AA8B4[] = INCBIN_U16("graphics/tileset_anims/aim_2_1.bin"); +static const u16 gUnknown_83AAAF4[] = INCBIN_U16("graphics/tileset_anims/aim_2_2.bin"); +static const u16 gUnknown_83AAD34[] = INCBIN_U16("graphics/tileset_anims/aim_2_3.bin"); +static const u16 gUnknown_83AAF74[] = INCBIN_U16("graphics/tileset_anims/aim_2_4.bin"); +static const u16 gUnknown_83AB1B4[] = INCBIN_U16("graphics/tileset_anims/aim_2_5.bin"); +static const u16 gUnknown_83AB3F4[] = INCBIN_U16("graphics/tileset_anims/aim_2_6.bin"); +static const u16 gUnknown_83AB634[] = INCBIN_U16("graphics/tileset_anims/aim_2_7.bin"); + +static const u16 *const gUnknown_83AB874[] = { + gUnknown_83AA674, + gUnknown_83AA8B4, + gUnknown_83AAAF4, + gUnknown_83AAD34, + gUnknown_83AAF74, + gUnknown_83AB1B4, + gUnknown_83AB3F4, + gUnknown_83AB634 +}; + +static const u16 gUnknown_83AB894[] = INCBIN_U16("graphics/tileset_anims/aim_3_0.bin"); +static const u16 gUnknown_83AB994[] = INCBIN_U16("graphics/tileset_anims/aim_3_1.bin"); +static const u16 gUnknown_83ABA94[] = INCBIN_U16("graphics/tileset_anims/aim_3_2.bin"); +static const u16 gUnknown_83ABB94[] = INCBIN_U16("graphics/tileset_anims/aim_3_3.bin"); +static const u16 gUnknown_83ABC94[] = INCBIN_U16("graphics/tileset_anims/aim_3_4.bin"); +static const u16 gUnknown_83ABD94[16] = {}; + +static const u16 *const gUnknown_83ABDB4[] = { + gUnknown_83AB894, + gUnknown_83AB994, + gUnknown_83ABA94, + gUnknown_83ABB94, + gUnknown_83ABC94 +}; + +static const u16 gUnknown_83ABDC8[] = INCBIN_U16("graphics/tileset_anims/aim_4_0.bin"); +static const u16 gUnknown_83ABEC8[] = INCBIN_U16("graphics/tileset_anims/aim_4_1.bin"); +static const u16 gUnknown_83ABFC8[] = INCBIN_U16("graphics/tileset_anims/aim_4_2.bin"); +static const u16 gUnknown_83AC0C8[] = INCBIN_U16("graphics/tileset_anims/aim_4_3.bin"); +static const u16 gUnknown_83AC1C8[0x10] = {}; + +static const u16 *const gUnknown_83AC1E8[] = { + gUnknown_83ABDC8, + gUnknown_83ABEC8, + gUnknown_83ABFC8, + gUnknown_83AC0C8 +}; + +static const u16 gUnknown_83AC1F8[] = INCBIN_U16("graphics/tileset_anims/aim_5_0.bin"); +static const u16 gUnknown_83AC2F8[] = INCBIN_U16("graphics/tileset_anims/aim_5_1.bin"); +static const u16 gUnknown_83AC3F8[] = INCBIN_U16("graphics/tileset_anims/aim_5_2.bin"); +static const u16 gUnknown_83AC4F8[] = INCBIN_U16("graphics/tileset_anims/aim_5_3.bin"); + +static const u16 *const gUnknown_83AC5F8[] = { + gUnknown_83AC1F8, + gUnknown_83AC2F8, + gUnknown_83AC3F8, + gUnknown_83AC4F8 +}; + +static const u16 gUnknown_83AC608[] = INCBIN_U16("graphics/tileset_anims/aim_6_0.bin"); +static const u16 gUnknown_83AC6E8[] = INCBIN_U16("graphics/tileset_anims/aim_6_1.bin"); + +static const u16 *const gUnknown_83AC7C8[] = { + gUnknown_83AC608, + gUnknown_83AC6E8 +}; + +static const u16 gUnknown_83AC7D0[] = INCBIN_U16("graphics/tileset_anims/aim_7_0.bin"); +static const u16 gUnknown_83AC850[] = INCBIN_U16("graphics/tileset_anims/aim_7_1.bin"); +static const u16 gUnknown_83AC8D0[] = INCBIN_U16("graphics/tileset_anims/aim_7_2.bin"); + +static const u16 *const gUnknown_83AC950[] = { + gUnknown_83AC7D0, + gUnknown_83AC850, + gUnknown_83AC8D0, + gUnknown_83AC850 +}; static void ResetTilesetAnimBuffer(void) { -- cgit v1.2.3 From 3e12bd8e078d6f1175a0614ba38ec4179c4f05cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 09:48:20 -0500 Subject: Minor refactor of tileset_anims --- src/tileset_anims.c | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 9403bc1df..4fdb1e6bf 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -209,26 +209,17 @@ static void _InitSecondaryTilesetAnimation(void) static void sub_80700A4(u16 timer) { - const u16 *const *ptr = gUnknown_83A7660; - u16 i = timer % 5; - - AppendTilesetAnimToBuffer(ptr[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); + AppendTilesetAnimToBuffer(gUnknown_83A7660[timer % NELEMS(gUnknown_83A7660)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); } static void sub_80700D0(u16 timer) { - const u16 *const *ptr = gUnknown_83AA654; - u16 i = timer % 8; - - AppendTilesetAnimToBuffer(ptr[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 0x600); + AppendTilesetAnimToBuffer(gUnknown_83AA654[timer % NELEMS(gUnknown_83AA654)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 0x600); } static void sub_80700F8(u16 timer) { - const u16 *const *ptr = gUnknown_83AB874; - u16 i = timer % 8; - - AppendTilesetAnimToBuffer(ptr[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x240); + AppendTilesetAnimToBuffer(gUnknown_83AB874[timer % NELEMS(gUnknown_83AB874)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x240); } static void sub_8070120(u16 timer) @@ -250,10 +241,7 @@ void sub_8070154(void) static void sub_807017C(u16 timer) { - const u16 *const *ptr = gUnknown_83ABDB4; - u16 i = timer % 5; - - AppendTilesetAnimToBuffer(ptr[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 0x100); + AppendTilesetAnimToBuffer(gUnknown_83ABDB4[timer % NELEMS(gUnknown_83ABDB4)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 0x100); } static void sub_80701AC(u16 timer) @@ -271,10 +259,7 @@ void sub_80701D8(void) static void sub_80701FC(u16 timer) { - const u16 *const *ptr = gUnknown_83AC1E8; - u16 i = timer % 4; - - AppendTilesetAnimToBuffer(ptr[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 0x100); + AppendTilesetAnimToBuffer(gUnknown_83AC1E8[timer % NELEMS(gUnknown_83AC1E8)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 0x100); } static void sub_8070224(u16 timer) @@ -292,10 +277,7 @@ void sub_8070250(void) static void sub_8070274(u16 timer) { - const u16 *const *ptr = gUnknown_83AC5F8; - u16 i = timer % 4; - - AppendTilesetAnimToBuffer(ptr[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 0x100); + AppendTilesetAnimToBuffer(gUnknown_83AC5F8[timer % NELEMS(gUnknown_83AC5F8)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 0x100); } static void sub_807029C(u16 timer) @@ -313,8 +295,8 @@ void sub_80702B4(void) static void sub_80702DC(u16 timer) { - u16 i = timer % 2; - + u16 i = timer % NELEMS(gUnknown_83AC7C8); + AppendTilesetAnimToBuffer(gUnknown_83AC7C8[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 0xE0); } @@ -333,7 +315,7 @@ void sub_807031C(void) static void sub_8070340(u16 timer) { - u16 i = timer % 4; + u16 i = timer % NELEMS(gUnknown_83AC950); AppendTilesetAnimToBuffer(gUnknown_83AC950[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 0x80); } -- cgit v1.2.3 From 083a4dfcff4627087560d08ddab27473dd9c0056 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 10:14:43 -0500 Subject: Disassemble data/field_ground_effect --- baserom.ips | Bin 249030 -> 248798 bytes data/field_ground_effect.s | 51 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/baserom.ips b/baserom.ips index 78355b3e8..dbfed775a 100644 Binary files a/baserom.ips and b/baserom.ips differ diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s index b1f34c8d7..c871b2d4b 100644 --- a/data/field_ground_effect.s +++ b/data/field_ground_effect.s @@ -1,34 +1,63 @@ .section .rodata .align 2 gUnknown_83A7024:: @ 83A7024 - .incbin "baserom.gba", 0x3A7024, 0x8 + .4byte 0x00000020, 0x00000010 gUnknown_83A702C:: @ 83A702C - .incbin "baserom.gba", 0x3A702C, 0x18 + .4byte MetatileBehavior_IsTallGrass_2 + .4byte MetatileBehavior_IsLongGrass + .4byte MetatileBehavior_IsPuddle + .4byte MetatileBehavior_IsSurfable + .4byte MetatileBehavior_IsWaterfallBottom + .4byte MetatileBehavior_UnusedReturnTrue gUnknown_83A7044:: @ 83A7044 - .incbin "baserom.gba", 0x3A7044, 0x18 + .4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000 gUnknown_83A705C:: @ 83A705C - .incbin "baserom.gba", 0x3A705C, 0x10 + .4byte MetatileBehavior_IsJumpSouth + .4byte MetatileBehavior_IsJumpNorth + .4byte MetatileBehavior_IsJumpWest + .4byte MetatileBehavior_IsJumpEast gUnknown_83A706C:: @ 83A706C - .incbin "baserom.gba", 0x3A706C, 0x10 + .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 gUnknown_83A707C:: @ 83A707C - .incbin "baserom.gba", 0x3A707C, 0x10 + .byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02 gUnknown_83A708C:: @ 83A708C - .incbin "baserom.gba", 0x3A708C, 0x10 + .byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01 gUnknown_83A709C:: @ 83A709C - .incbin "baserom.gba", 0x3A709C, 0xC + .4byte nullsub_26 + .4byte DoTracksGroundEffect_Footprints + .4byte DoTracksGroundEffect_BikeTireTracks gUnknown_83A70A8:: @ 83A70A8 - .incbin "baserom.gba", 0x3A70A8, 0x4 + .byte 0x0d, 0x00, 0x18, 0x00 gUnknown_83A70AC:: @ 83A70AC - .incbin "baserom.gba", 0x3A70AC, 0x10 + .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 gUnknown_83A70BC:: @ 83A70BC - .incbin "baserom.gba", 0x3A70BC, 0x50 + .4byte GroundEffect_SpawnOnTallGrass + .4byte GroundEffect_StepOnTallGrass + .4byte GroundEffect_SpawnOnLongGrass + .4byte GroundEffect_StepOnLongGrass + .4byte GroundEffect_WaterReflection + .4byte GroundEffect_IceReflection + .4byte GroundEffect_FlowingWater + .4byte GroundEffect_SandTracks + .4byte GroundEffect_DeepSandTracks + .4byte GroundEffect_Ripple + .4byte GroundEffect_StepOnPuddle + .4byte GroundEffect_SandHeap + .4byte GroundEffect_JumpOnTallGrass + .4byte GroundEffect_JumpOnLongGrass + .4byte GroundEffect_JumpOnShallowWater + .4byte GroundEffect_JumpOnWater + .4byte GroundEffect_JumpLandingDust + .4byte GroundEffect_ShortGrass + .4byte GroundEffect_HotSprings + .4byte GroundEffect_Seaweed -- cgit v1.2.3 From 81e1efbd9e17ff56042b597d0e42274c589d8a85 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 10:59:22 -0500 Subject: Fix review comments --- data/tileset_anims.s | 2 - graphics/tileset_anims/aim_0_0.bin | Bin 128 -> 0 bytes graphics/tileset_anims/aim_0_1.bin | Bin 128 -> 0 bytes graphics/tileset_anims/aim_0_2.bin | Bin 128 -> 0 bytes graphics/tileset_anims/aim_0_3.bin | Bin 128 -> 0 bytes graphics/tileset_anims/aim_0_4.bin | Bin 128 -> 0 bytes graphics/tileset_anims/aim_1_0.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/aim_1_1.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/aim_1_2.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/aim_1_3.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/aim_1_4.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/aim_1_5.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/aim_1_6.bin | Bin 1536 -> 0 bytes graphics/tileset_anims/aim_1_7.bin | Bin 1504 -> 0 bytes graphics/tileset_anims/aim_2_0.bin | Bin 576 -> 0 bytes graphics/tileset_anims/aim_2_1.bin | Bin 576 -> 0 bytes graphics/tileset_anims/aim_2_2.bin | Bin 576 -> 0 bytes graphics/tileset_anims/aim_2_3.bin | Bin 576 -> 0 bytes graphics/tileset_anims/aim_2_4.bin | Bin 576 -> 0 bytes graphics/tileset_anims/aim_2_5.bin | Bin 576 -> 0 bytes graphics/tileset_anims/aim_2_6.bin | Bin 576 -> 0 bytes graphics/tileset_anims/aim_2_7.bin | Bin 576 -> 0 bytes graphics/tileset_anims/aim_3_0.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_3_1.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_3_2.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_3_3.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_3_4.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_4_0.bin | 1 - graphics/tileset_anims/aim_4_1.bin | 1 - graphics/tileset_anims/aim_4_2.bin | 1 - graphics/tileset_anims/aim_4_3.bin | 1 - graphics/tileset_anims/aim_5_0.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_5_1.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_5_2.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_5_3.bin | Bin 256 -> 0 bytes graphics/tileset_anims/aim_6_0.bin | Bin 224 -> 0 bytes graphics/tileset_anims/aim_6_1.bin | Bin 224 -> 0 bytes graphics/tileset_anims/aim_7_0.bin | Bin 128 -> 0 bytes graphics/tileset_anims/aim_7_1.bin | Bin 128 -> 0 bytes graphics/tileset_anims/aim_7_2.bin | Bin 128 -> 0 bytes graphics/tileset_anims/anim_0_0.bin | Bin 0 -> 128 bytes graphics/tileset_anims/anim_0_1.bin | Bin 0 -> 128 bytes graphics/tileset_anims/anim_0_2.bin | Bin 0 -> 128 bytes graphics/tileset_anims/anim_0_3.bin | Bin 0 -> 128 bytes graphics/tileset_anims/anim_0_4.bin | Bin 0 -> 128 bytes graphics/tileset_anims/anim_1_0.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/anim_1_1.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/anim_1_2.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/anim_1_3.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/anim_1_4.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/anim_1_5.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/anim_1_6.bin | Bin 0 -> 1536 bytes graphics/tileset_anims/anim_1_7.bin | Bin 0 -> 1504 bytes graphics/tileset_anims/anim_2_0.bin | Bin 0 -> 576 bytes graphics/tileset_anims/anim_2_1.bin | Bin 0 -> 576 bytes graphics/tileset_anims/anim_2_2.bin | Bin 0 -> 576 bytes graphics/tileset_anims/anim_2_3.bin | Bin 0 -> 576 bytes graphics/tileset_anims/anim_2_4.bin | Bin 0 -> 576 bytes graphics/tileset_anims/anim_2_5.bin | Bin 0 -> 576 bytes graphics/tileset_anims/anim_2_6.bin | Bin 0 -> 576 bytes graphics/tileset_anims/anim_2_7.bin | Bin 0 -> 576 bytes graphics/tileset_anims/anim_3_0.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_3_1.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_3_2.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_3_3.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_3_4.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_4_0.bin | 1 + graphics/tileset_anims/anim_4_1.bin | 1 + graphics/tileset_anims/anim_4_2.bin | 1 + graphics/tileset_anims/anim_4_3.bin | 1 + graphics/tileset_anims/anim_5_0.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_5_1.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_5_2.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_5_3.bin | Bin 0 -> 256 bytes graphics/tileset_anims/anim_6_0.bin | Bin 0 -> 224 bytes graphics/tileset_anims/anim_6_1.bin | Bin 0 -> 224 bytes graphics/tileset_anims/anim_7_0.bin | Bin 0 -> 128 bytes graphics/tileset_anims/anim_7_1.bin | Bin 0 -> 128 bytes graphics/tileset_anims/anim_7_2.bin | Bin 0 -> 128 bytes src/tileset_anims.c | 78 ++++++++++++++++++------------------ 80 files changed, 43 insertions(+), 45 deletions(-) delete mode 100644 data/tileset_anims.s delete mode 100644 graphics/tileset_anims/aim_0_0.bin delete mode 100644 graphics/tileset_anims/aim_0_1.bin delete mode 100644 graphics/tileset_anims/aim_0_2.bin delete mode 100644 graphics/tileset_anims/aim_0_3.bin delete mode 100644 graphics/tileset_anims/aim_0_4.bin delete mode 100644 graphics/tileset_anims/aim_1_0.bin delete mode 100644 graphics/tileset_anims/aim_1_1.bin delete mode 100644 graphics/tileset_anims/aim_1_2.bin delete mode 100644 graphics/tileset_anims/aim_1_3.bin delete mode 100644 graphics/tileset_anims/aim_1_4.bin delete mode 100644 graphics/tileset_anims/aim_1_5.bin delete mode 100644 graphics/tileset_anims/aim_1_6.bin delete mode 100644 graphics/tileset_anims/aim_1_7.bin delete mode 100644 graphics/tileset_anims/aim_2_0.bin delete mode 100644 graphics/tileset_anims/aim_2_1.bin delete mode 100644 graphics/tileset_anims/aim_2_2.bin delete mode 100644 graphics/tileset_anims/aim_2_3.bin delete mode 100644 graphics/tileset_anims/aim_2_4.bin delete mode 100644 graphics/tileset_anims/aim_2_5.bin delete mode 100644 graphics/tileset_anims/aim_2_6.bin delete mode 100644 graphics/tileset_anims/aim_2_7.bin delete mode 100644 graphics/tileset_anims/aim_3_0.bin delete mode 100644 graphics/tileset_anims/aim_3_1.bin delete mode 100644 graphics/tileset_anims/aim_3_2.bin delete mode 100644 graphics/tileset_anims/aim_3_3.bin delete mode 100644 graphics/tileset_anims/aim_3_4.bin delete mode 100644 graphics/tileset_anims/aim_4_0.bin delete mode 100644 graphics/tileset_anims/aim_4_1.bin delete mode 100644 graphics/tileset_anims/aim_4_2.bin delete mode 100644 graphics/tileset_anims/aim_4_3.bin delete mode 100644 graphics/tileset_anims/aim_5_0.bin delete mode 100644 graphics/tileset_anims/aim_5_1.bin delete mode 100644 graphics/tileset_anims/aim_5_2.bin delete mode 100644 graphics/tileset_anims/aim_5_3.bin delete mode 100644 graphics/tileset_anims/aim_6_0.bin delete mode 100644 graphics/tileset_anims/aim_6_1.bin delete mode 100644 graphics/tileset_anims/aim_7_0.bin delete mode 100644 graphics/tileset_anims/aim_7_1.bin delete mode 100644 graphics/tileset_anims/aim_7_2.bin create mode 100644 graphics/tileset_anims/anim_0_0.bin create mode 100644 graphics/tileset_anims/anim_0_1.bin create mode 100644 graphics/tileset_anims/anim_0_2.bin create mode 100644 graphics/tileset_anims/anim_0_3.bin create mode 100644 graphics/tileset_anims/anim_0_4.bin create mode 100644 graphics/tileset_anims/anim_1_0.bin create mode 100644 graphics/tileset_anims/anim_1_1.bin create mode 100644 graphics/tileset_anims/anim_1_2.bin create mode 100644 graphics/tileset_anims/anim_1_3.bin create mode 100644 graphics/tileset_anims/anim_1_4.bin create mode 100644 graphics/tileset_anims/anim_1_5.bin create mode 100644 graphics/tileset_anims/anim_1_6.bin create mode 100644 graphics/tileset_anims/anim_1_7.bin create mode 100644 graphics/tileset_anims/anim_2_0.bin create mode 100644 graphics/tileset_anims/anim_2_1.bin create mode 100644 graphics/tileset_anims/anim_2_2.bin create mode 100644 graphics/tileset_anims/anim_2_3.bin create mode 100644 graphics/tileset_anims/anim_2_4.bin create mode 100644 graphics/tileset_anims/anim_2_5.bin create mode 100644 graphics/tileset_anims/anim_2_6.bin create mode 100644 graphics/tileset_anims/anim_2_7.bin create mode 100644 graphics/tileset_anims/anim_3_0.bin create mode 100644 graphics/tileset_anims/anim_3_1.bin create mode 100644 graphics/tileset_anims/anim_3_2.bin create mode 100644 graphics/tileset_anims/anim_3_3.bin create mode 100644 graphics/tileset_anims/anim_3_4.bin create mode 100644 graphics/tileset_anims/anim_4_0.bin create mode 100644 graphics/tileset_anims/anim_4_1.bin create mode 100644 graphics/tileset_anims/anim_4_2.bin create mode 100644 graphics/tileset_anims/anim_4_3.bin create mode 100644 graphics/tileset_anims/anim_5_0.bin create mode 100644 graphics/tileset_anims/anim_5_1.bin create mode 100644 graphics/tileset_anims/anim_5_2.bin create mode 100644 graphics/tileset_anims/anim_5_3.bin create mode 100644 graphics/tileset_anims/anim_6_0.bin create mode 100644 graphics/tileset_anims/anim_6_1.bin create mode 100644 graphics/tileset_anims/anim_7_0.bin create mode 100644 graphics/tileset_anims/anim_7_1.bin create mode 100644 graphics/tileset_anims/anim_7_2.bin diff --git a/data/tileset_anims.s b/data/tileset_anims.s deleted file mode 100644 index bd9a27175..000000000 --- a/data/tileset_anims.s +++ /dev/null @@ -1,2 +0,0 @@ - .section .rodata - .align 2 diff --git a/graphics/tileset_anims/aim_0_0.bin b/graphics/tileset_anims/aim_0_0.bin deleted file mode 100644 index 38ac085bd..000000000 Binary files a/graphics/tileset_anims/aim_0_0.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_0_1.bin b/graphics/tileset_anims/aim_0_1.bin deleted file mode 100644 index 286411540..000000000 Binary files a/graphics/tileset_anims/aim_0_1.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_0_2.bin b/graphics/tileset_anims/aim_0_2.bin deleted file mode 100644 index 8bfe63cd2..000000000 Binary files a/graphics/tileset_anims/aim_0_2.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_0_3.bin b/graphics/tileset_anims/aim_0_3.bin deleted file mode 100644 index 13522349b..000000000 Binary files a/graphics/tileset_anims/aim_0_3.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_0_4.bin b/graphics/tileset_anims/aim_0_4.bin deleted file mode 100644 index 8ef77c561..000000000 Binary files a/graphics/tileset_anims/aim_0_4.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_1_0.bin b/graphics/tileset_anims/aim_1_0.bin deleted file mode 100644 index fb05bd03c..000000000 Binary files a/graphics/tileset_anims/aim_1_0.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_1_1.bin b/graphics/tileset_anims/aim_1_1.bin deleted file mode 100644 index d67987eca..000000000 Binary files a/graphics/tileset_anims/aim_1_1.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_1_2.bin b/graphics/tileset_anims/aim_1_2.bin deleted file mode 100644 index 813f93914..000000000 Binary files a/graphics/tileset_anims/aim_1_2.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_1_3.bin b/graphics/tileset_anims/aim_1_3.bin deleted file mode 100644 index df560357c..000000000 Binary files a/graphics/tileset_anims/aim_1_3.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_1_4.bin b/graphics/tileset_anims/aim_1_4.bin deleted file mode 100644 index d5d005d28..000000000 Binary files a/graphics/tileset_anims/aim_1_4.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_1_5.bin b/graphics/tileset_anims/aim_1_5.bin deleted file mode 100644 index 4e5e0e247..000000000 Binary files a/graphics/tileset_anims/aim_1_5.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_1_6.bin b/graphics/tileset_anims/aim_1_6.bin deleted file mode 100644 index bb716829f..000000000 Binary files a/graphics/tileset_anims/aim_1_6.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_1_7.bin b/graphics/tileset_anims/aim_1_7.bin deleted file mode 100644 index c49e57e7f..000000000 Binary files a/graphics/tileset_anims/aim_1_7.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_2_0.bin b/graphics/tileset_anims/aim_2_0.bin deleted file mode 100644 index e9225fe58..000000000 Binary files a/graphics/tileset_anims/aim_2_0.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_2_1.bin b/graphics/tileset_anims/aim_2_1.bin deleted file mode 100644 index 74424fff9..000000000 Binary files a/graphics/tileset_anims/aim_2_1.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_2_2.bin b/graphics/tileset_anims/aim_2_2.bin deleted file mode 100644 index 7b2e609c3..000000000 Binary files a/graphics/tileset_anims/aim_2_2.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_2_3.bin b/graphics/tileset_anims/aim_2_3.bin deleted file mode 100644 index 85db3d2df..000000000 Binary files a/graphics/tileset_anims/aim_2_3.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_2_4.bin b/graphics/tileset_anims/aim_2_4.bin deleted file mode 100644 index c350f70ec..000000000 Binary files a/graphics/tileset_anims/aim_2_4.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_2_5.bin b/graphics/tileset_anims/aim_2_5.bin deleted file mode 100644 index 71636ac22..000000000 Binary files a/graphics/tileset_anims/aim_2_5.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_2_6.bin b/graphics/tileset_anims/aim_2_6.bin deleted file mode 100644 index 79e125e62..000000000 Binary files a/graphics/tileset_anims/aim_2_6.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_2_7.bin b/graphics/tileset_anims/aim_2_7.bin deleted file mode 100644 index 1df096dbc..000000000 Binary files a/graphics/tileset_anims/aim_2_7.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_3_0.bin b/graphics/tileset_anims/aim_3_0.bin deleted file mode 100644 index 6a911444b..000000000 Binary files a/graphics/tileset_anims/aim_3_0.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_3_1.bin b/graphics/tileset_anims/aim_3_1.bin deleted file mode 100644 index a66f3382d..000000000 Binary files a/graphics/tileset_anims/aim_3_1.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_3_2.bin b/graphics/tileset_anims/aim_3_2.bin deleted file mode 100644 index ed7890e83..000000000 Binary files a/graphics/tileset_anims/aim_3_2.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_3_3.bin b/graphics/tileset_anims/aim_3_3.bin deleted file mode 100644 index 5cfdc3ebd..000000000 Binary files a/graphics/tileset_anims/aim_3_3.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_3_4.bin b/graphics/tileset_anims/aim_3_4.bin deleted file mode 100644 index 83dc605ff..000000000 Binary files a/graphics/tileset_anims/aim_3_4.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_4_0.bin b/graphics/tileset_anims/aim_4_0.bin deleted file mode 100644 index 462cf8168..000000000 --- a/graphics/tileset_anims/aim_4_0.bin +++ /dev/null @@ -1 +0,0 @@ -îîîîîïîîïîîîÝݽûÝýú¿Ý­ÿ»ýú¿Ï­ÿ¿Ïîîîîîîîþîîþî¿ÛÝÝû¯ßÝ»ÿÚÝüû¯ßüûÿÚ­ÿÿ»ºÿÿÿµûÿÿ¥ûÿ»ª»»ª]ª«ZÝ]ªºÝ½Uû»ÿÿÚÿÿÿ«ÿÿ¿[»ÿ¿Zª»»ª¥ºªÕ«ªÕÝ¿UÛÝ­ý»ÿݽÿÿÚ½¿ûݽ»»Ýý»¿ÝýÿÿÝýÿÿݽÿÿÿ»ß­ÿÿÛÝ¿ûÛÚ»»ÛÝû»ßÝÿÿßÝÿÿßÝÿÿÛÝݽ¿ûݽ»»ýý»¿ýÝÿÿÝßýÿÝÝÝÝÝÝýÿÝÝÝÝ¿ûÛÝ»»ÛÝû»ßßÿÿÝßÿßýÝÝÝÝÝÿßÝÝÝÝÝÝ \ No newline at end of file diff --git a/graphics/tileset_anims/aim_4_1.bin b/graphics/tileset_anims/aim_4_1.bin deleted file mode 100644 index eeccebb35..000000000 --- a/graphics/tileset_anims/aim_4_1.bin +++ /dev/null @@ -1 +0,0 @@ -îîîîîîîîîîî»ýÝ»¿Ýªÿ»­û¿ÿ­ÿûÏýÿûÏîîîîîîîî»îîîû»Ýß»ÿªÝÿû¿Úü¿ÿÚü¿ÿßúÿ¿ÿºÿÿ»µûÿÿ]ûÿ»]»»ªÝUµªÚº¯ªÝ½ÿ[ÿûÿ¯»ÿÿ«ÿÿ¿[»ÿ¿Õª»»Õª[Uݪú«­µÿÛÝݽ¿ûݺ»»Ýý»¿ÝýÿÿÝýÿÿݽÿÿݽ¿ûݽ»»¿û«Ý»»ÛÝû»ßÝÿÿßÝÿÿß­ÿÿÛÝ¿ûÛÝ»»ÛÝÝý»¿ÝýÿÿßýÿÿßÝÿÿýÝýÿÝÝÝÝÝýÝÝÝÝÿÿû»ßÝÿÿßÝÿÿßýÿÿÝýÿßÝßÝÝÝÝÝÝßÝÿÿÝÝ \ No newline at end of file diff --git a/graphics/tileset_anims/aim_4_2.bin b/graphics/tileset_anims/aim_4_2.bin deleted file mode 100644 index 3808d0b82..000000000 --- a/graphics/tileset_anims/aim_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/aim_4_3.bin b/graphics/tileset_anims/aim_4_3.bin deleted file mode 100644 index 45374b4aa..000000000 --- a/graphics/tileset_anims/aim_4_3.bin +++ /dev/null @@ -1 +0,0 @@ -îîîîîîîîîîî»ýÝ»¿Ýªÿ»­û¿ÿ­ÿûÏýÿûÏîîîîîîîî»îîîû»Ýß»ÿªÝÿû¿Úü¿ÿÚü¿ÿßúÿ¿ÿºÿÿ»µûÿÿ]ûÿ»]»»ªÝUµªÚº¯ªÝ½ÿ[ÿûÿ¯»ÿÿ«ÿÿ¿[»ÿ¿Õª»»Õª[Uݪú«­µÿÛÝÝýÿÿÝúÿÿݽÿÿݽ¿ûݽ»»Ýý»¿ÝýÿÿÝýÿÿÿÿ¯ÝÿÿßÝÿÿÛÝ¿ûÛ­»»ÛÝû»ßÝÿÿßÝÿÿßÝݽÿÿݽ¿ûݽ»»ÝÝ»¿ÝÝýÿÝÝÝÝÝÝÝÝÝÝÝÝÿÿÛÝ¿ûÛÝ»»ÛÝû»ÝÝÿßÝÝÝÝÝÝÝÝÝÝÝÝÝÝ \ No newline at end of file diff --git a/graphics/tileset_anims/aim_5_0.bin b/graphics/tileset_anims/aim_5_0.bin deleted file mode 100644 index face13a75..000000000 Binary files a/graphics/tileset_anims/aim_5_0.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_5_1.bin b/graphics/tileset_anims/aim_5_1.bin deleted file mode 100644 index f1a93897e..000000000 Binary files a/graphics/tileset_anims/aim_5_1.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_5_2.bin b/graphics/tileset_anims/aim_5_2.bin deleted file mode 100644 index d63cdc5fc..000000000 Binary files a/graphics/tileset_anims/aim_5_2.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_5_3.bin b/graphics/tileset_anims/aim_5_3.bin deleted file mode 100644 index 0c396ccbe..000000000 Binary files a/graphics/tileset_anims/aim_5_3.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_6_0.bin b/graphics/tileset_anims/aim_6_0.bin deleted file mode 100644 index 8bdac939e..000000000 Binary files a/graphics/tileset_anims/aim_6_0.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_6_1.bin b/graphics/tileset_anims/aim_6_1.bin deleted file mode 100644 index cd2e32723..000000000 Binary files a/graphics/tileset_anims/aim_6_1.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_7_0.bin b/graphics/tileset_anims/aim_7_0.bin deleted file mode 100644 index f94617c73..000000000 Binary files a/graphics/tileset_anims/aim_7_0.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_7_1.bin b/graphics/tileset_anims/aim_7_1.bin deleted file mode 100644 index ac59368ca..000000000 Binary files a/graphics/tileset_anims/aim_7_1.bin and /dev/null differ diff --git a/graphics/tileset_anims/aim_7_2.bin b/graphics/tileset_anims/aim_7_2.bin deleted file mode 100644 index 9dd915040..000000000 Binary files a/graphics/tileset_anims/aim_7_2.bin and /dev/null differ diff --git a/graphics/tileset_anims/anim_0_0.bin b/graphics/tileset_anims/anim_0_0.bin new file mode 100644 index 000000000..38ac085bd Binary files /dev/null and b/graphics/tileset_anims/anim_0_0.bin differ diff --git a/graphics/tileset_anims/anim_0_1.bin b/graphics/tileset_anims/anim_0_1.bin new file mode 100644 index 000000000..286411540 Binary files /dev/null and b/graphics/tileset_anims/anim_0_1.bin differ diff --git a/graphics/tileset_anims/anim_0_2.bin b/graphics/tileset_anims/anim_0_2.bin new file mode 100644 index 000000000..8bfe63cd2 Binary files /dev/null and b/graphics/tileset_anims/anim_0_2.bin differ diff --git a/graphics/tileset_anims/anim_0_3.bin b/graphics/tileset_anims/anim_0_3.bin new file mode 100644 index 000000000..13522349b Binary files /dev/null and b/graphics/tileset_anims/anim_0_3.bin differ diff --git a/graphics/tileset_anims/anim_0_4.bin b/graphics/tileset_anims/anim_0_4.bin new file mode 100644 index 000000000..8ef77c561 Binary files /dev/null and b/graphics/tileset_anims/anim_0_4.bin differ diff --git a/graphics/tileset_anims/anim_1_0.bin b/graphics/tileset_anims/anim_1_0.bin new file mode 100644 index 000000000..fb05bd03c Binary files /dev/null and b/graphics/tileset_anims/anim_1_0.bin differ diff --git a/graphics/tileset_anims/anim_1_1.bin b/graphics/tileset_anims/anim_1_1.bin new file mode 100644 index 000000000..d67987eca Binary files /dev/null and b/graphics/tileset_anims/anim_1_1.bin differ diff --git a/graphics/tileset_anims/anim_1_2.bin b/graphics/tileset_anims/anim_1_2.bin new file mode 100644 index 000000000..813f93914 Binary files /dev/null and b/graphics/tileset_anims/anim_1_2.bin differ diff --git a/graphics/tileset_anims/anim_1_3.bin b/graphics/tileset_anims/anim_1_3.bin new file mode 100644 index 000000000..df560357c Binary files /dev/null and b/graphics/tileset_anims/anim_1_3.bin differ diff --git a/graphics/tileset_anims/anim_1_4.bin b/graphics/tileset_anims/anim_1_4.bin new file mode 100644 index 000000000..d5d005d28 Binary files /dev/null and b/graphics/tileset_anims/anim_1_4.bin differ diff --git a/graphics/tileset_anims/anim_1_5.bin b/graphics/tileset_anims/anim_1_5.bin new file mode 100644 index 000000000..4e5e0e247 Binary files /dev/null and b/graphics/tileset_anims/anim_1_5.bin differ diff --git a/graphics/tileset_anims/anim_1_6.bin b/graphics/tileset_anims/anim_1_6.bin new file mode 100644 index 000000000..bb716829f Binary files /dev/null and b/graphics/tileset_anims/anim_1_6.bin differ diff --git a/graphics/tileset_anims/anim_1_7.bin b/graphics/tileset_anims/anim_1_7.bin new file mode 100644 index 000000000..c49e57e7f Binary files /dev/null and b/graphics/tileset_anims/anim_1_7.bin differ diff --git a/graphics/tileset_anims/anim_2_0.bin b/graphics/tileset_anims/anim_2_0.bin new file mode 100644 index 000000000..e9225fe58 Binary files /dev/null and b/graphics/tileset_anims/anim_2_0.bin differ diff --git a/graphics/tileset_anims/anim_2_1.bin b/graphics/tileset_anims/anim_2_1.bin new file mode 100644 index 000000000..74424fff9 Binary files /dev/null and b/graphics/tileset_anims/anim_2_1.bin differ diff --git a/graphics/tileset_anims/anim_2_2.bin b/graphics/tileset_anims/anim_2_2.bin new file mode 100644 index 000000000..7b2e609c3 Binary files /dev/null and b/graphics/tileset_anims/anim_2_2.bin differ diff --git a/graphics/tileset_anims/anim_2_3.bin b/graphics/tileset_anims/anim_2_3.bin new file mode 100644 index 000000000..85db3d2df Binary files /dev/null and b/graphics/tileset_anims/anim_2_3.bin differ diff --git a/graphics/tileset_anims/anim_2_4.bin b/graphics/tileset_anims/anim_2_4.bin new file mode 100644 index 000000000..c350f70ec Binary files /dev/null and b/graphics/tileset_anims/anim_2_4.bin differ diff --git a/graphics/tileset_anims/anim_2_5.bin b/graphics/tileset_anims/anim_2_5.bin new file mode 100644 index 000000000..71636ac22 Binary files /dev/null and b/graphics/tileset_anims/anim_2_5.bin differ diff --git a/graphics/tileset_anims/anim_2_6.bin b/graphics/tileset_anims/anim_2_6.bin new file mode 100644 index 000000000..79e125e62 Binary files /dev/null and b/graphics/tileset_anims/anim_2_6.bin differ diff --git a/graphics/tileset_anims/anim_2_7.bin b/graphics/tileset_anims/anim_2_7.bin new file mode 100644 index 000000000..1df096dbc Binary files /dev/null and b/graphics/tileset_anims/anim_2_7.bin differ diff --git a/graphics/tileset_anims/anim_3_0.bin b/graphics/tileset_anims/anim_3_0.bin new file mode 100644 index 000000000..6a911444b Binary files /dev/null and b/graphics/tileset_anims/anim_3_0.bin differ diff --git a/graphics/tileset_anims/anim_3_1.bin b/graphics/tileset_anims/anim_3_1.bin new file mode 100644 index 000000000..a66f3382d Binary files /dev/null and b/graphics/tileset_anims/anim_3_1.bin differ diff --git a/graphics/tileset_anims/anim_3_2.bin b/graphics/tileset_anims/anim_3_2.bin new file mode 100644 index 000000000..ed7890e83 Binary files /dev/null and b/graphics/tileset_anims/anim_3_2.bin differ diff --git a/graphics/tileset_anims/anim_3_3.bin b/graphics/tileset_anims/anim_3_3.bin new file mode 100644 index 000000000..5cfdc3ebd Binary files /dev/null and b/graphics/tileset_anims/anim_3_3.bin differ diff --git a/graphics/tileset_anims/anim_3_4.bin b/graphics/tileset_anims/anim_3_4.bin new file mode 100644 index 000000000..83dc605ff Binary files /dev/null and b/graphics/tileset_anims/anim_3_4.bin differ 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 new file mode 100644 index 000000000..face13a75 Binary files /dev/null and b/graphics/tileset_anims/anim_5_0.bin differ diff --git a/graphics/tileset_anims/anim_5_1.bin b/graphics/tileset_anims/anim_5_1.bin new file mode 100644 index 000000000..f1a93897e Binary files /dev/null and b/graphics/tileset_anims/anim_5_1.bin differ diff --git a/graphics/tileset_anims/anim_5_2.bin b/graphics/tileset_anims/anim_5_2.bin new file mode 100644 index 000000000..d63cdc5fc Binary files /dev/null and b/graphics/tileset_anims/anim_5_2.bin differ diff --git a/graphics/tileset_anims/anim_5_3.bin b/graphics/tileset_anims/anim_5_3.bin new file mode 100644 index 000000000..0c396ccbe Binary files /dev/null and b/graphics/tileset_anims/anim_5_3.bin differ diff --git a/graphics/tileset_anims/anim_6_0.bin b/graphics/tileset_anims/anim_6_0.bin new file mode 100644 index 000000000..8bdac939e Binary files /dev/null and b/graphics/tileset_anims/anim_6_0.bin differ diff --git a/graphics/tileset_anims/anim_6_1.bin b/graphics/tileset_anims/anim_6_1.bin new file mode 100644 index 000000000..cd2e32723 Binary files /dev/null and b/graphics/tileset_anims/anim_6_1.bin differ diff --git a/graphics/tileset_anims/anim_7_0.bin b/graphics/tileset_anims/anim_7_0.bin new file mode 100644 index 000000000..f94617c73 Binary files /dev/null and b/graphics/tileset_anims/anim_7_0.bin differ diff --git a/graphics/tileset_anims/anim_7_1.bin b/graphics/tileset_anims/anim_7_1.bin new file mode 100644 index 000000000..ac59368ca Binary files /dev/null and b/graphics/tileset_anims/anim_7_1.bin differ diff --git a/graphics/tileset_anims/anim_7_2.bin b/graphics/tileset_anims/anim_7_2.bin new file mode 100644 index 000000000..9dd915040 Binary files /dev/null and b/graphics/tileset_anims/anim_7_2.bin differ diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 4fdb1e6bf..a8539a5d8 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -23,11 +23,11 @@ static void (*sSecondaryTilesetAnimCallback)(u16); static void _InitPrimaryTilesetAnimation(void); static void _InitSecondaryTilesetAnimation(void); -static const u16 gUnknown_83A73E0[] = INCBIN_U16("graphics/tileset_anims/aim_0_0.bin"); -static const u16 gUnknown_83A7460[] = INCBIN_U16("graphics/tileset_anims/aim_0_1.bin"); -static const u16 gUnknown_83A74E0[] = INCBIN_U16("graphics/tileset_anims/aim_0_2.bin"); -static const u16 gUnknown_83A7560[] = INCBIN_U16("graphics/tileset_anims/aim_0_3.bin"); -static const u16 gUnknown_83A75E0[] = INCBIN_U16("graphics/tileset_anims/aim_0_4.bin"); +static const u16 gUnknown_83A73E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_0.bin"); +static const u16 gUnknown_83A7460[] = INCBIN_U16("graphics/tileset_anims/anim_0_1.bin"); +static const u16 gUnknown_83A74E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_2.bin"); +static const u16 gUnknown_83A7560[] = INCBIN_U16("graphics/tileset_anims/anim_0_3.bin"); +static const u16 gUnknown_83A75E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_4.bin"); static const u16 *const gUnknown_83A7660[] = { gUnknown_83A73E0, @@ -37,14 +37,14 @@ static const u16 *const gUnknown_83A7660[] = { gUnknown_83A75E0 }; -static const u16 gUnknown_83A7674[] = INCBIN_U16("graphics/tileset_anims/aim_1_0.bin"); -static const u16 gUnknown_83A7C74[] = INCBIN_U16("graphics/tileset_anims/aim_1_1.bin"); -static const u16 gUnknown_83A8274[] = INCBIN_U16("graphics/tileset_anims/aim_1_2.bin"); -static const u16 gUnknown_83A8874[] = INCBIN_U16("graphics/tileset_anims/aim_1_3.bin"); -static const u16 gUnknown_83A8E74[] = INCBIN_U16("graphics/tileset_anims/aim_1_4.bin"); -static const u16 gUnknown_83A9474[] = INCBIN_U16("graphics/tileset_anims/aim_1_5.bin"); -static const u16 gUnknown_83A9A74[] = INCBIN_U16("graphics/tileset_anims/aim_1_6.bin"); -static const u16 gUnknown_83AA074[] = INCBIN_U16("graphics/tileset_anims/aim_1_7.bin"); +static const u16 gUnknown_83A7674[] = INCBIN_U16("graphics/tileset_anims/anim_1_0.bin"); +static const u16 gUnknown_83A7C74[] = INCBIN_U16("graphics/tileset_anims/anim_1_1.bin"); +static const u16 gUnknown_83A8274[] = INCBIN_U16("graphics/tileset_anims/anim_1_2.bin"); +static const u16 gUnknown_83A8874[] = INCBIN_U16("graphics/tileset_anims/anim_1_3.bin"); +static const u16 gUnknown_83A8E74[] = INCBIN_U16("graphics/tileset_anims/anim_1_4.bin"); +static const u16 gUnknown_83A9474[] = INCBIN_U16("graphics/tileset_anims/anim_1_5.bin"); +static const u16 gUnknown_83A9A74[] = INCBIN_U16("graphics/tileset_anims/anim_1_6.bin"); +static const u16 gUnknown_83AA074[] = INCBIN_U16("graphics/tileset_anims/anim_1_7.bin"); static const u16 *const gUnknown_83AA654[] = { gUnknown_83A7674, @@ -57,14 +57,14 @@ static const u16 *const gUnknown_83AA654[] = { gUnknown_83AA074 }; -static const u16 gUnknown_83AA674[] = INCBIN_U16("graphics/tileset_anims/aim_2_0.bin"); -static const u16 gUnknown_83AA8B4[] = INCBIN_U16("graphics/tileset_anims/aim_2_1.bin"); -static const u16 gUnknown_83AAAF4[] = INCBIN_U16("graphics/tileset_anims/aim_2_2.bin"); -static const u16 gUnknown_83AAD34[] = INCBIN_U16("graphics/tileset_anims/aim_2_3.bin"); -static const u16 gUnknown_83AAF74[] = INCBIN_U16("graphics/tileset_anims/aim_2_4.bin"); -static const u16 gUnknown_83AB1B4[] = INCBIN_U16("graphics/tileset_anims/aim_2_5.bin"); -static const u16 gUnknown_83AB3F4[] = INCBIN_U16("graphics/tileset_anims/aim_2_6.bin"); -static const u16 gUnknown_83AB634[] = INCBIN_U16("graphics/tileset_anims/aim_2_7.bin"); +static const u16 gUnknown_83AA674[] = INCBIN_U16("graphics/tileset_anims/anim_2_0.bin"); +static const u16 gUnknown_83AA8B4[] = INCBIN_U16("graphics/tileset_anims/anim_2_1.bin"); +static const u16 gUnknown_83AAAF4[] = INCBIN_U16("graphics/tileset_anims/anim_2_2.bin"); +static const u16 gUnknown_83AAD34[] = INCBIN_U16("graphics/tileset_anims/anim_2_3.bin"); +static const u16 gUnknown_83AAF74[] = INCBIN_U16("graphics/tileset_anims/anim_2_4.bin"); +static const u16 gUnknown_83AB1B4[] = INCBIN_U16("graphics/tileset_anims/anim_2_5.bin"); +static const u16 gUnknown_83AB3F4[] = INCBIN_U16("graphics/tileset_anims/anim_2_6.bin"); +static const u16 gUnknown_83AB634[] = INCBIN_U16("graphics/tileset_anims/anim_2_7.bin"); static const u16 *const gUnknown_83AB874[] = { gUnknown_83AA674, @@ -77,11 +77,11 @@ static const u16 *const gUnknown_83AB874[] = { gUnknown_83AB634 }; -static const u16 gUnknown_83AB894[] = INCBIN_U16("graphics/tileset_anims/aim_3_0.bin"); -static const u16 gUnknown_83AB994[] = INCBIN_U16("graphics/tileset_anims/aim_3_1.bin"); -static const u16 gUnknown_83ABA94[] = INCBIN_U16("graphics/tileset_anims/aim_3_2.bin"); -static const u16 gUnknown_83ABB94[] = INCBIN_U16("graphics/tileset_anims/aim_3_3.bin"); -static const u16 gUnknown_83ABC94[] = INCBIN_U16("graphics/tileset_anims/aim_3_4.bin"); +static const u16 gUnknown_83AB894[] = INCBIN_U16("graphics/tileset_anims/anim_3_0.bin"); +static const u16 gUnknown_83AB994[] = INCBIN_U16("graphics/tileset_anims/anim_3_1.bin"); +static const u16 gUnknown_83ABA94[] = INCBIN_U16("graphics/tileset_anims/anim_3_2.bin"); +static const u16 gUnknown_83ABB94[] = INCBIN_U16("graphics/tileset_anims/anim_3_3.bin"); +static const u16 gUnknown_83ABC94[] = INCBIN_U16("graphics/tileset_anims/anim_3_4.bin"); static const u16 gUnknown_83ABD94[16] = {}; static const u16 *const gUnknown_83ABDB4[] = { @@ -92,10 +92,10 @@ static const u16 *const gUnknown_83ABDB4[] = { gUnknown_83ABC94 }; -static const u16 gUnknown_83ABDC8[] = INCBIN_U16("graphics/tileset_anims/aim_4_0.bin"); -static const u16 gUnknown_83ABEC8[] = INCBIN_U16("graphics/tileset_anims/aim_4_1.bin"); -static const u16 gUnknown_83ABFC8[] = INCBIN_U16("graphics/tileset_anims/aim_4_2.bin"); -static const u16 gUnknown_83AC0C8[] = INCBIN_U16("graphics/tileset_anims/aim_4_3.bin"); +static const u16 gUnknown_83ABDC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_0.bin"); +static const u16 gUnknown_83ABEC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_1.bin"); +static const u16 gUnknown_83ABFC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_2.bin"); +static const u16 gUnknown_83AC0C8[] = INCBIN_U16("graphics/tileset_anims/anim_4_3.bin"); static const u16 gUnknown_83AC1C8[0x10] = {}; static const u16 *const gUnknown_83AC1E8[] = { @@ -105,10 +105,10 @@ static const u16 *const gUnknown_83AC1E8[] = { gUnknown_83AC0C8 }; -static const u16 gUnknown_83AC1F8[] = INCBIN_U16("graphics/tileset_anims/aim_5_0.bin"); -static const u16 gUnknown_83AC2F8[] = INCBIN_U16("graphics/tileset_anims/aim_5_1.bin"); -static const u16 gUnknown_83AC3F8[] = INCBIN_U16("graphics/tileset_anims/aim_5_2.bin"); -static const u16 gUnknown_83AC4F8[] = INCBIN_U16("graphics/tileset_anims/aim_5_3.bin"); +static const u16 gUnknown_83AC1F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_0.bin"); +static const u16 gUnknown_83AC2F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_1.bin"); +static const u16 gUnknown_83AC3F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_2.bin"); +static const u16 gUnknown_83AC4F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_3.bin"); static const u16 *const gUnknown_83AC5F8[] = { gUnknown_83AC1F8, @@ -117,17 +117,17 @@ static const u16 *const gUnknown_83AC5F8[] = { gUnknown_83AC4F8 }; -static const u16 gUnknown_83AC608[] = INCBIN_U16("graphics/tileset_anims/aim_6_0.bin"); -static const u16 gUnknown_83AC6E8[] = INCBIN_U16("graphics/tileset_anims/aim_6_1.bin"); +static const u16 gUnknown_83AC608[] = INCBIN_U16("graphics/tileset_anims/anim_6_0.bin"); +static const u16 gUnknown_83AC6E8[] = INCBIN_U16("graphics/tileset_anims/anim_6_1.bin"); static const u16 *const gUnknown_83AC7C8[] = { gUnknown_83AC608, gUnknown_83AC6E8 }; -static const u16 gUnknown_83AC7D0[] = INCBIN_U16("graphics/tileset_anims/aim_7_0.bin"); -static const u16 gUnknown_83AC850[] = INCBIN_U16("graphics/tileset_anims/aim_7_1.bin"); -static const u16 gUnknown_83AC8D0[] = INCBIN_U16("graphics/tileset_anims/aim_7_2.bin"); +static const u16 gUnknown_83AC7D0[] = INCBIN_U16("graphics/tileset_anims/anim_7_0.bin"); +static const u16 gUnknown_83AC850[] = INCBIN_U16("graphics/tileset_anims/anim_7_1.bin"); +static const u16 gUnknown_83AC8D0[] = INCBIN_U16("graphics/tileset_anims/anim_7_2.bin"); static const u16 *const gUnknown_83AC950[] = { gUnknown_83AC7D0, -- cgit v1.2.3