diff options
80 files changed, 137 insertions, 134 deletions
diff --git a/data/tilesets/primary/general/anim/flower/0.png b/data/tilesets/primary/general/anim/flower/0.png Binary files differnew file mode 100644 index 000000000..d445b4045 --- /dev/null +++ b/data/tilesets/primary/general/anim/flower/0.png diff --git a/data/tilesets/primary/general/anim/flower/1.png b/data/tilesets/primary/general/anim/flower/1.png Binary files differnew file mode 100644 index 000000000..1aed594f6 --- /dev/null +++ b/data/tilesets/primary/general/anim/flower/1.png diff --git a/data/tilesets/primary/general/anim/flower/2.png b/data/tilesets/primary/general/anim/flower/2.png Binary files differnew file mode 100644 index 000000000..5e58c29a9 --- /dev/null +++ b/data/tilesets/primary/general/anim/flower/2.png diff --git a/data/tilesets/primary/general/anim/flower/3.png b/data/tilesets/primary/general/anim/flower/3.png Binary files differnew file mode 100644 index 000000000..bac3d26ff --- /dev/null +++ b/data/tilesets/primary/general/anim/flower/3.png diff --git a/data/tilesets/primary/general/anim/flower/4.png b/data/tilesets/primary/general/anim/flower/4.png Binary files differnew file mode 100644 index 000000000..8e589150a --- /dev/null +++ b/data/tilesets/primary/general/anim/flower/4.png diff --git a/data/tilesets/primary/general/anim/sandwatersedge/0.png b/data/tilesets/primary/general/anim/sandwatersedge/0.png Binary files differnew file mode 100644 index 000000000..0ade81d73 --- /dev/null +++ b/data/tilesets/primary/general/anim/sandwatersedge/0.png diff --git a/data/tilesets/primary/general/anim/sandwatersedge/1.png b/data/tilesets/primary/general/anim/sandwatersedge/1.png Binary files differnew file mode 100644 index 000000000..8dac0eba7 --- /dev/null +++ b/data/tilesets/primary/general/anim/sandwatersedge/1.png diff --git a/data/tilesets/primary/general/anim/sandwatersedge/2.png b/data/tilesets/primary/general/anim/sandwatersedge/2.png Binary files differnew file mode 100644 index 000000000..ba6e93bc4 --- /dev/null +++ b/data/tilesets/primary/general/anim/sandwatersedge/2.png diff --git a/data/tilesets/primary/general/anim/sandwatersedge/3.png b/data/tilesets/primary/general/anim/sandwatersedge/3.png Binary files differnew file mode 100644 index 000000000..9436601c1 --- /dev/null +++ b/data/tilesets/primary/general/anim/sandwatersedge/3.png diff --git a/data/tilesets/primary/general/anim/sandwatersedge/4.png b/data/tilesets/primary/general/anim/sandwatersedge/4.png Binary files differnew file mode 100644 index 000000000..5b74a16fa --- /dev/null +++ b/data/tilesets/primary/general/anim/sandwatersedge/4.png diff --git a/data/tilesets/primary/general/anim/sandwatersedge/5.png b/data/tilesets/primary/general/anim/sandwatersedge/5.png Binary files differnew file mode 100644 index 000000000..6c72f4e0e --- /dev/null +++ b/data/tilesets/primary/general/anim/sandwatersedge/5.png diff --git a/data/tilesets/primary/general/anim/sandwatersedge/6.png b/data/tilesets/primary/general/anim/sandwatersedge/6.png Binary files differnew file mode 100644 index 000000000..f56c55b04 --- /dev/null +++ b/data/tilesets/primary/general/anim/sandwatersedge/6.png diff --git a/data/tilesets/primary/general/anim/sandwatersedge/7.png b/data/tilesets/primary/general/anim/sandwatersedge/7.png Binary files differnew file mode 100644 index 000000000..549c44410 --- /dev/null +++ b/data/tilesets/primary/general/anim/sandwatersedge/7.png diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png Binary files differnew file mode 100644 index 000000000..ce16ac050 --- /dev/null +++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/0.png diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png Binary files differnew file mode 100644 index 000000000..7e41494c5 --- /dev/null +++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/1.png diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png Binary files differnew file mode 100644 index 000000000..5765ac477 --- /dev/null +++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/2.png diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png Binary files differnew file mode 100644 index 000000000..dbc111a7f --- /dev/null +++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/3.png diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png Binary files differnew file mode 100644 index 000000000..a8ee69c1e --- /dev/null +++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/4.png diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png Binary files differnew file mode 100644 index 000000000..318c7b796 --- /dev/null +++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/5.png diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png Binary files differnew file mode 100644 index 000000000..c31713d34 --- /dev/null +++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/6.png diff --git a/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png b/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png Binary files differnew file mode 100644 index 000000000..e01c91449 --- /dev/null +++ b/data/tilesets/primary/general/anim/water_current_landwatersedge/7.png diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/0.png b/data/tilesets/secondary/celadon_city/anim/fountain/0.png Binary files differnew file mode 100644 index 000000000..c5783f481 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/anim/fountain/0.png diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/1.png b/data/tilesets/secondary/celadon_city/anim/fountain/1.png Binary files differnew file mode 100644 index 000000000..7d1f6fb2e --- /dev/null +++ b/data/tilesets/secondary/celadon_city/anim/fountain/1.png diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/2.png b/data/tilesets/secondary/celadon_city/anim/fountain/2.png Binary files differnew file mode 100644 index 000000000..91b54ad6e --- /dev/null +++ b/data/tilesets/secondary/celadon_city/anim/fountain/2.png diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/3.png b/data/tilesets/secondary/celadon_city/anim/fountain/3.png Binary files differnew file mode 100644 index 000000000..45f2e40ad --- /dev/null +++ b/data/tilesets/secondary/celadon_city/anim/fountain/3.png diff --git a/data/tilesets/secondary/celadon_city/anim/fountain/4.png b/data/tilesets/secondary/celadon_city/anim/fountain/4.png Binary files differnew file mode 100644 index 000000000..dd9a94d47 --- /dev/null +++ b/data/tilesets/secondary/celadon_city/anim/fountain/4.png diff --git a/data/tilesets/secondary/celadon_gym/anim/flowers/0.png b/data/tilesets/secondary/celadon_gym/anim/flowers/0.png Binary files differnew file mode 100644 index 000000000..eabff7d8a --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/anim/flowers/0.png diff --git a/data/tilesets/secondary/celadon_gym/anim/flowers/1.png b/data/tilesets/secondary/celadon_gym/anim/flowers/1.png Binary files differnew file mode 100644 index 000000000..fd9eb53f7 --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/anim/flowers/1.png diff --git a/data/tilesets/secondary/celadon_gym/anim/flowers/2.png b/data/tilesets/secondary/celadon_gym/anim/flowers/2.png Binary files differnew file mode 100644 index 000000000..a3edd7ccd --- /dev/null +++ b/data/tilesets/secondary/celadon_gym/anim/flowers/2.png diff --git a/data/tilesets/secondary/mt_ember/anim/steam/0.png b/data/tilesets/secondary/mt_ember/anim/steam/0.png Binary files differnew file mode 100644 index 000000000..ab0ca2c69 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/anim/steam/0.png diff --git a/data/tilesets/secondary/mt_ember/anim/steam/1.png b/data/tilesets/secondary/mt_ember/anim/steam/1.png Binary files differnew file mode 100644 index 000000000..1324c7ad5 --- /dev/null +++ b/data/tilesets/secondary/mt_ember/anim/steam/1.png diff --git a/data/tilesets/secondary/mt_ember/anim/steam/2.png b/data/tilesets/secondary/mt_ember/anim/steam/2.png Binary files differnew file mode 100644 index 000000000..310aa1ebd --- /dev/null +++ b/data/tilesets/secondary/mt_ember/anim/steam/2.png diff --git a/data/tilesets/secondary/mt_ember/anim/steam/3.png b/data/tilesets/secondary/mt_ember/anim/steam/3.png Binary files differnew file mode 100644 index 000000000..a6ec412cf --- /dev/null +++ b/data/tilesets/secondary/mt_ember/anim/steam/3.png diff --git a/data/tilesets/secondary/silph_co/anim/fountain/0.png b/data/tilesets/secondary/silph_co/anim/fountain/0.png Binary files differnew file mode 100644 index 000000000..09714447b --- /dev/null +++ b/data/tilesets/secondary/silph_co/anim/fountain/0.png diff --git a/data/tilesets/secondary/silph_co/anim/fountain/1.png b/data/tilesets/secondary/silph_co/anim/fountain/1.png Binary files differnew file mode 100644 index 000000000..5063c1476 --- /dev/null +++ b/data/tilesets/secondary/silph_co/anim/fountain/1.png diff --git a/data/tilesets/secondary/silph_co/anim/fountain/2.png b/data/tilesets/secondary/silph_co/anim/fountain/2.png Binary files differnew file mode 100644 index 000000000..eb46683ea --- /dev/null +++ b/data/tilesets/secondary/silph_co/anim/fountain/2.png diff --git a/data/tilesets/secondary/silph_co/anim/fountain/3.png b/data/tilesets/secondary/silph_co/anim/fountain/3.png Binary files differnew file mode 100644 index 000000000..e582fbce2 --- /dev/null +++ b/data/tilesets/secondary/silph_co/anim/fountain/3.png diff --git a/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png Binary files differnew file mode 100644 index 000000000..a17ad6f5e --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.png diff --git a/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.png Binary files differnew file mode 100644 index 000000000..bfddebccd --- /dev/null +++ b/data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.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 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 59e2be4ee..dbb583269 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -590,3 +590,6 @@ $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png $(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 + +$(TILESETGFXDIR)/primary/general/anim/water_current_landwatersedge/7.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 47 diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 04e129049..fcf6a6038 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -17,117 +17,121 @@ static void (*sSecondaryTilesetAnimCallback)(u16); static void _InitPrimaryTilesetAnimation(void); static void _InitSecondaryTilesetAnimation(void); -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, - gUnknown_83A7460, - gUnknown_83A74E0, - gUnknown_83A7560, - gUnknown_83A75E0 +// palette: general 00 +static const u16 sTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/0.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/1.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/2.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/3.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/4.4bpp"); + +static const u16 *const sTilesetAnims_General_Flower[] = { + sTilesetAnims_General_Flower_Frame0, + sTilesetAnims_General_Flower_Frame1, + sTilesetAnims_General_Flower_Frame2, + sTilesetAnims_General_Flower_Frame3, + sTilesetAnims_General_Flower_Frame4 }; -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, - gUnknown_83A7C74, - gUnknown_83A8274, - gUnknown_83A8874, - gUnknown_83A8E74, - gUnknown_83A9474, - gUnknown_83A9A74, - gUnknown_83AA074 +// palette: general 04 +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/0.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/1.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/2.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/3.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/4.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/5.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/6.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/7.4bpp"); + +static const u16 *const sTilesetAnims_General_Water_Current_LandWatersEdge[] = { + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7 }; -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, - gUnknown_83AA8B4, - gUnknown_83AAAF4, - gUnknown_83AAD34, - gUnknown_83AAF74, - gUnknown_83AB1B4, - gUnknown_83AB3F4, - gUnknown_83AB634 +// palette: general 04 +static const u16 sTilesetAnims_General_SandWatersEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/0.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/1.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/2.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/3.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/4.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/5.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/6.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/7.4bpp"); + +static const u16 *const sTilesetAnims_General_SandWatersEdge[] = { + sTilesetAnims_General_SandWatersEdge_Frame0, + sTilesetAnims_General_SandWatersEdge_Frame1, + sTilesetAnims_General_SandWatersEdge_Frame2, + sTilesetAnims_General_SandWatersEdge_Frame3, + sTilesetAnims_General_SandWatersEdge_Frame4, + sTilesetAnims_General_SandWatersEdge_Frame5, + sTilesetAnims_General_SandWatersEdge_Frame6, + sTilesetAnims_General_SandWatersEdge_Frame7 }; -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"); +// palette: general 00 +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/0.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/1.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame2[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/2.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame3[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/3.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame4[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/4.4bpp"); 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 *const sTilesetAnims_CeladonCity_Fountain[] = { + sTilesetAnims_CeladonCity_Fountain_Frame0, + sTilesetAnims_CeladonCity_Fountain_Frame1, + sTilesetAnims_CeladonCity_Fountain_Frame2, + sTilesetAnims_CeladonCity_Fountain_Frame3, + sTilesetAnims_CeladonCity_Fountain_Frame4 }; -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[] = { - gUnknown_83ABDC8, - gUnknown_83ABEC8, - gUnknown_83ABFC8, - gUnknown_83AC0C8 +static const u16 sTilesetAnims_SilphCo_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/0.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/1.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame2[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/2.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame3[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/3.4bpp"); +static const u16 gUnknown_83AC1C8[16] = {}; + +static const u16 *const sTilesetAnims_SilphCo_Fountain[] = { + sTilesetAnims_SilphCo_Fountain_Frame0, + sTilesetAnims_SilphCo_Fountain_Frame1, + sTilesetAnims_SilphCo_Fountain_Frame2, + sTilesetAnims_SilphCo_Fountain_Frame3 }; -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 sTilesetAnims_MtEmber_Steam_Frame0[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/0.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame1[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/1.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame2[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/2.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame3[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/3.4bpp"); -static const u16 *const gUnknown_83AC5F8[] = { - gUnknown_83AC1F8, - gUnknown_83AC2F8, - gUnknown_83AC3F8, - gUnknown_83AC4F8 +static const u16 *const sTilesetAnims_MtEmber_Steam[] = { + sTilesetAnims_MtEmber_Steam_Frame0, + sTilesetAnims_MtEmber_Steam_Frame1, + sTilesetAnims_MtEmber_Steam_Frame2, + sTilesetAnims_MtEmber_Steam_Frame3 }; -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 sTilesetAnims_VermilionGym_MotorizedDoor_Frame0[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.4bpp"); +static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame1[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.4bpp"); -static const u16 *const gUnknown_83AC7C8[] = { - gUnknown_83AC608, - gUnknown_83AC6E8 +static const u16 *const sTilesetAnims_VermilionGym_MotorizedDoor[] = { + sTilesetAnims_VermilionGym_MotorizedDoor_Frame0, + sTilesetAnims_VermilionGym_MotorizedDoor_Frame1 }; -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 sTilesetAnims_CeladonGym_Flowers_Frame0[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/0.4bpp"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame1[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/1.4bpp"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame2[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/2.4bpp"); -static const u16 *const gUnknown_83AC950[] = { - gUnknown_83AC7D0, - gUnknown_83AC850, - gUnknown_83AC8D0, - gUnknown_83AC850 +static const u16 *const sTilesetAnims_CeladonGym_Flowers[] = { + sTilesetAnims_CeladonGym_Flowers_Frame0, + sTilesetAnims_CeladonGym_Flowers_Frame1, + sTilesetAnims_CeladonGym_Flowers_Frame2, + sTilesetAnims_CeladonGym_Flowers_Frame1 }; static void ResetTilesetAnimBuffer(void) @@ -201,128 +205,128 @@ static void _InitSecondaryTilesetAnimation(void) gMapHeader.mapLayout->secondaryTileset->callback(); } -static void sub_80700A4(u16 timer) +static void QueueAnimTiles_General_Flower(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83A7660[timer % NELEMS(gUnknown_83A7660)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); + AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % NELEMS(sTilesetAnims_General_Flower)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 4 * TILE_SIZE_4BPP); } -static void sub_80700D0(u16 timer) +static void QueueAnimTiles_General_Water_Current_LandWatersEdge(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AA654[timer % NELEMS(gUnknown_83AA654)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 0x600); + AppendTilesetAnimToBuffer(sTilesetAnims_General_Water_Current_LandWatersEdge[timer % NELEMS(sTilesetAnims_General_Water_Current_LandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 48 * TILE_SIZE_4BPP); } -static void sub_80700F8(u16 timer) +static void QueueAnimTiles_General_SandWatersEdge(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AB874[timer % NELEMS(gUnknown_83AB874)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x240); + AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % NELEMS(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP); } -static void sub_8070120(u16 timer) +static void TilesetAnim_General(u16 timer) { if (timer % 8 == 0) - sub_80700F8(timer >> 3); + QueueAnimTiles_General_SandWatersEdge(timer >> 3); if (timer % 16 == 1) - sub_80700D0(timer >> 4); + QueueAnimTiles_General_Water_Current_LandWatersEdge(timer >> 4); if (timer % 16 == 2) - sub_80700A4(timer >> 4); + QueueAnimTiles_General_Flower(timer >> 4); } void InitTilesetAnim_General(void) { sPrimaryTilesetAnimCounter = 0; sPrimaryTilesetAnimCounterMax = 640; - sPrimaryTilesetAnimCallback = sub_8070120; + sPrimaryTilesetAnimCallback = TilesetAnim_General; } -static void sub_807017C(u16 timer) +static void QueueAnimTiles_CeladonCity_Fountain(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83ABDB4[timer % NELEMS(gUnknown_83ABDB4)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_CeladonCity_Fountain[timer % NELEMS(sTilesetAnims_CeladonCity_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 8 * TILE_SIZE_4BPP); } -static void sub_80701AC(u16 timer) +static void TilesetAnim_CeladonCity(u16 timer) { if (timer % 12 == 0) - sub_807017C(timer / 12); + QueueAnimTiles_CeladonCity_Fountain(timer / 12); } void InitTilesetAnim_CeladonCity(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 120; - sSecondaryTilesetAnimCallback = sub_80701AC; + sSecondaryTilesetAnimCallback = TilesetAnim_CeladonCity; } -static void sub_80701FC(u16 timer) +static void QueueAnimTiles_SilphCo_Fountain(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AC1E8[timer % NELEMS(gUnknown_83AC1E8)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_SilphCo_Fountain[timer % NELEMS(sTilesetAnims_SilphCo_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 8 * TILE_SIZE_4BPP); } -static void sub_8070224(u16 timer) +static void TilesetAnim_SilphCo(u16 timer) { if (timer % 10 == 0) - sub_80701FC(timer / 10); + QueueAnimTiles_SilphCo_Fountain(timer / 10); } void InitTilesetAnim_SilphCo(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 160; - sSecondaryTilesetAnimCallback = sub_8070224; + sSecondaryTilesetAnimCallback = TilesetAnim_SilphCo; } -static void sub_8070274(u16 timer) +static void QueueAnimTiles_MtEmber_Steam(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AC5F8[timer % NELEMS(gUnknown_83AC5F8)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % NELEMS(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 8 * TILE_SIZE_4BPP); } -static void sub_807029C(u16 timer) +static void TilesetAnim_MtEmber(u16 timer) { if (timer % 16 == 0) - sub_8070274(timer >> 4); + QueueAnimTiles_MtEmber_Steam(timer >> 4); } void InitTilesetAnim_MtEmber(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 256; - sSecondaryTilesetAnimCallback = sub_807029C; + sSecondaryTilesetAnimCallback = TilesetAnim_MtEmber; } -static void sub_80702DC(u16 timer) +static void QueueAnimTiles_VermilionGym_MotorizedDoor(u16 timer) { - u16 i = timer % NELEMS(gUnknown_83AC7C8); + u16 i = timer % NELEMS(sTilesetAnims_VermilionGym_MotorizedDoor); - AppendTilesetAnimToBuffer(gUnknown_83AC7C8[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 0xE0); + AppendTilesetAnimToBuffer(sTilesetAnims_VermilionGym_MotorizedDoor[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 7 * TILE_SIZE_4BPP); } -static void sub_8070304(u16 timer) +static void TilesetAnim_VermilionGym(u16 timer) { if (timer % 2 == 0) - sub_80702DC(timer >> 1); + QueueAnimTiles_VermilionGym_MotorizedDoor(timer >> 1); } void InitTilesetAnim_VermilionGym(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 240; - sSecondaryTilesetAnimCallback = sub_8070304; + sSecondaryTilesetAnimCallback = TilesetAnim_VermilionGym; } -static void sub_8070340(u16 timer) +static void QueueAnimTiles_CeladonGym_Flowers(u16 timer) { - u16 i = timer % NELEMS(gUnknown_83AC950); + u16 i = timer % NELEMS(sTilesetAnims_CeladonGym_Flowers); - AppendTilesetAnimToBuffer(gUnknown_83AC950[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 0x80); + AppendTilesetAnimToBuffer(sTilesetAnims_CeladonGym_Flowers[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 4 * TILE_SIZE_4BPP); } -static void sub_8070368(u16 timer) +static void TilesetAnim_CeladonGym(u16 timer) { if (timer % 16 == 0) - sub_8070340(timer >> 4); + QueueAnimTiles_CeladonGym_Flowers(timer >> 4); } void InitTilesetAnim_CeladonGym(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 256; - sSecondaryTilesetAnimCallback = sub_8070368; + sSecondaryTilesetAnimCallback = TilesetAnim_CeladonGym; } |
