diff options
43 files changed, 117 insertions, 35 deletions
diff --git a/baserom.ips b/baserom.ips Binary files differindex bde26c658..78355b3e8 100644 --- a/baserom.ips +++ b/baserom.ips 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 Binary files differnew file mode 100644 index 000000000..38ac085bd --- /dev/null +++ b/graphics/tileset_anims/aim_0_0.bin diff --git a/graphics/tileset_anims/aim_0_1.bin b/graphics/tileset_anims/aim_0_1.bin Binary files differnew file mode 100644 index 000000000..286411540 --- /dev/null +++ b/graphics/tileset_anims/aim_0_1.bin diff --git a/graphics/tileset_anims/aim_0_2.bin b/graphics/tileset_anims/aim_0_2.bin Binary files differnew file mode 100644 index 000000000..8bfe63cd2 --- /dev/null +++ b/graphics/tileset_anims/aim_0_2.bin diff --git a/graphics/tileset_anims/aim_0_3.bin b/graphics/tileset_anims/aim_0_3.bin Binary files differnew file mode 100644 index 000000000..13522349b --- /dev/null +++ b/graphics/tileset_anims/aim_0_3.bin diff --git a/graphics/tileset_anims/aim_0_4.bin b/graphics/tileset_anims/aim_0_4.bin Binary files differnew file mode 100644 index 000000000..8ef77c561 --- /dev/null +++ b/graphics/tileset_anims/aim_0_4.bin diff --git a/graphics/tileset_anims/aim_1_0.bin b/graphics/tileset_anims/aim_1_0.bin Binary files differnew file mode 100644 index 000000000..fb05bd03c --- /dev/null +++ b/graphics/tileset_anims/aim_1_0.bin diff --git a/graphics/tileset_anims/aim_1_1.bin b/graphics/tileset_anims/aim_1_1.bin Binary files differnew file mode 100644 index 000000000..d67987eca --- /dev/null +++ b/graphics/tileset_anims/aim_1_1.bin diff --git a/graphics/tileset_anims/aim_1_2.bin b/graphics/tileset_anims/aim_1_2.bin Binary files differnew file mode 100644 index 000000000..813f93914 --- /dev/null +++ b/graphics/tileset_anims/aim_1_2.bin diff --git a/graphics/tileset_anims/aim_1_3.bin b/graphics/tileset_anims/aim_1_3.bin Binary files differnew file mode 100644 index 000000000..df560357c --- /dev/null +++ b/graphics/tileset_anims/aim_1_3.bin diff --git a/graphics/tileset_anims/aim_1_4.bin b/graphics/tileset_anims/aim_1_4.bin Binary files differnew file mode 100644 index 000000000..d5d005d28 --- /dev/null +++ b/graphics/tileset_anims/aim_1_4.bin diff --git a/graphics/tileset_anims/aim_1_5.bin b/graphics/tileset_anims/aim_1_5.bin Binary files differnew file mode 100644 index 000000000..4e5e0e247 --- /dev/null +++ b/graphics/tileset_anims/aim_1_5.bin diff --git a/graphics/tileset_anims/aim_1_6.bin b/graphics/tileset_anims/aim_1_6.bin Binary files differnew file mode 100644 index 000000000..bb716829f --- /dev/null +++ b/graphics/tileset_anims/aim_1_6.bin diff --git a/graphics/tileset_anims/aim_1_7.bin b/graphics/tileset_anims/aim_1_7.bin Binary files differnew file mode 100644 index 000000000..c49e57e7f --- /dev/null +++ b/graphics/tileset_anims/aim_1_7.bin diff --git a/graphics/tileset_anims/aim_2_0.bin b/graphics/tileset_anims/aim_2_0.bin Binary files differnew file mode 100644 index 000000000..e9225fe58 --- /dev/null +++ b/graphics/tileset_anims/aim_2_0.bin diff --git a/graphics/tileset_anims/aim_2_1.bin b/graphics/tileset_anims/aim_2_1.bin Binary files differnew file mode 100644 index 000000000..74424fff9 --- /dev/null +++ b/graphics/tileset_anims/aim_2_1.bin diff --git a/graphics/tileset_anims/aim_2_2.bin b/graphics/tileset_anims/aim_2_2.bin Binary files differnew file mode 100644 index 000000000..7b2e609c3 --- /dev/null +++ b/graphics/tileset_anims/aim_2_2.bin diff --git a/graphics/tileset_anims/aim_2_3.bin b/graphics/tileset_anims/aim_2_3.bin Binary files differnew file mode 100644 index 000000000..85db3d2df --- /dev/null +++ b/graphics/tileset_anims/aim_2_3.bin diff --git a/graphics/tileset_anims/aim_2_4.bin b/graphics/tileset_anims/aim_2_4.bin Binary files differnew file mode 100644 index 000000000..c350f70ec --- /dev/null +++ b/graphics/tileset_anims/aim_2_4.bin diff --git a/graphics/tileset_anims/aim_2_5.bin b/graphics/tileset_anims/aim_2_5.bin Binary files differnew file mode 100644 index 000000000..71636ac22 --- /dev/null +++ b/graphics/tileset_anims/aim_2_5.bin diff --git a/graphics/tileset_anims/aim_2_6.bin b/graphics/tileset_anims/aim_2_6.bin Binary files differnew file mode 100644 index 000000000..79e125e62 --- /dev/null +++ b/graphics/tileset_anims/aim_2_6.bin diff --git a/graphics/tileset_anims/aim_2_7.bin b/graphics/tileset_anims/aim_2_7.bin Binary files differnew file mode 100644 index 000000000..1df096dbc --- /dev/null +++ b/graphics/tileset_anims/aim_2_7.bin diff --git a/graphics/tileset_anims/aim_3_0.bin b/graphics/tileset_anims/aim_3_0.bin Binary files differnew file mode 100644 index 000000000..6a911444b --- /dev/null +++ b/graphics/tileset_anims/aim_3_0.bin diff --git a/graphics/tileset_anims/aim_3_1.bin b/graphics/tileset_anims/aim_3_1.bin Binary files differnew file mode 100644 index 000000000..a66f3382d --- /dev/null +++ b/graphics/tileset_anims/aim_3_1.bin diff --git a/graphics/tileset_anims/aim_3_2.bin b/graphics/tileset_anims/aim_3_2.bin Binary files differnew file mode 100644 index 000000000..ed7890e83 --- /dev/null +++ b/graphics/tileset_anims/aim_3_2.bin diff --git a/graphics/tileset_anims/aim_3_3.bin b/graphics/tileset_anims/aim_3_3.bin Binary files differnew file mode 100644 index 000000000..5cfdc3ebd --- /dev/null +++ b/graphics/tileset_anims/aim_3_3.bin diff --git a/graphics/tileset_anims/aim_3_4.bin b/graphics/tileset_anims/aim_3_4.bin Binary files differnew file mode 100644 index 000000000..83dc605ff --- /dev/null +++ b/graphics/tileset_anims/aim_3_4.bin 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 Binary files differnew file mode 100644 index 000000000..face13a75 --- /dev/null +++ b/graphics/tileset_anims/aim_5_0.bin diff --git a/graphics/tileset_anims/aim_5_1.bin b/graphics/tileset_anims/aim_5_1.bin Binary files differnew file mode 100644 index 000000000..f1a93897e --- /dev/null +++ b/graphics/tileset_anims/aim_5_1.bin diff --git a/graphics/tileset_anims/aim_5_2.bin b/graphics/tileset_anims/aim_5_2.bin Binary files differnew file mode 100644 index 000000000..d63cdc5fc --- /dev/null +++ b/graphics/tileset_anims/aim_5_2.bin diff --git a/graphics/tileset_anims/aim_5_3.bin b/graphics/tileset_anims/aim_5_3.bin Binary files differnew file mode 100644 index 000000000..0c396ccbe --- /dev/null +++ b/graphics/tileset_anims/aim_5_3.bin diff --git a/graphics/tileset_anims/aim_6_0.bin b/graphics/tileset_anims/aim_6_0.bin Binary files differnew file mode 100644 index 000000000..8bdac939e --- /dev/null +++ b/graphics/tileset_anims/aim_6_0.bin diff --git a/graphics/tileset_anims/aim_6_1.bin b/graphics/tileset_anims/aim_6_1.bin Binary files differnew file mode 100644 index 000000000..cd2e32723 --- /dev/null +++ b/graphics/tileset_anims/aim_6_1.bin diff --git a/graphics/tileset_anims/aim_7_0.bin b/graphics/tileset_anims/aim_7_0.bin Binary files differnew file mode 100644 index 000000000..f94617c73 --- /dev/null +++ b/graphics/tileset_anims/aim_7_0.bin diff --git a/graphics/tileset_anims/aim_7_1.bin b/graphics/tileset_anims/aim_7_1.bin Binary files differnew file mode 100644 index 000000000..ac59368ca --- /dev/null +++ b/graphics/tileset_anims/aim_7_1.bin diff --git a/graphics/tileset_anims/aim_7_2.bin b/graphics/tileset_anims/aim_7_2.bin Binary files differnew file mode 100644 index 000000000..9dd915040 --- /dev/null +++ b/graphics/tileset_anims/aim_7_2.bin diff --git a/ld_script.txt b/ld_script.txt index 8141efec6..c23a7f105 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) { |