Fix review comments

41 files changed, 39 insertions, 41 deletions

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/anim_0_0.bin
index 38ac085bd..38ac085bd 100644
--- a/graphics/tileset_anims/aim_0_0.bin
+++ b/graphics/tileset_anims/anim_0_0.bin
diff --git a/graphics/tileset_anims/aim_0_1.bin b/graphics/tileset_anims/anim_0_1.bin
index 286411540..286411540 100644
--- a/graphics/tileset_anims/aim_0_1.bin
+++ b/graphics/tileset_anims/anim_0_1.bin
diff --git a/graphics/tileset_anims/aim_0_2.bin b/graphics/tileset_anims/anim_0_2.bin
index 8bfe63cd2..8bfe63cd2 100644
--- a/graphics/tileset_anims/aim_0_2.bin
+++ b/graphics/tileset_anims/anim_0_2.bin
diff --git a/graphics/tileset_anims/aim_0_3.bin b/graphics/tileset_anims/anim_0_3.bin
index 13522349b..13522349b 100644
--- a/graphics/tileset_anims/aim_0_3.bin
+++ b/graphics/tileset_anims/anim_0_3.bin
diff --git a/graphics/tileset_anims/aim_0_4.bin b/graphics/tileset_anims/anim_0_4.bin
index 8ef77c561..8ef77c561 100644
--- a/graphics/tileset_anims/aim_0_4.bin
+++ b/graphics/tileset_anims/anim_0_4.bin
diff --git a/graphics/tileset_anims/aim_1_0.bin b/graphics/tileset_anims/anim_1_0.bin
index fb05bd03c..fb05bd03c 100644
--- a/graphics/tileset_anims/aim_1_0.bin
+++ b/graphics/tileset_anims/anim_1_0.bin
diff --git a/graphics/tileset_anims/aim_1_1.bin b/graphics/tileset_anims/anim_1_1.bin
index d67987eca..d67987eca 100644
--- a/graphics/tileset_anims/aim_1_1.bin
+++ b/graphics/tileset_anims/anim_1_1.bin
diff --git a/graphics/tileset_anims/aim_1_2.bin b/graphics/tileset_anims/anim_1_2.bin
index 813f93914..813f93914 100644
--- a/graphics/tileset_anims/aim_1_2.bin
+++ b/graphics/tileset_anims/anim_1_2.bin
diff --git a/graphics/tileset_anims/aim_1_3.bin b/graphics/tileset_anims/anim_1_3.bin
index df560357c..df560357c 100644
--- a/graphics/tileset_anims/aim_1_3.bin
+++ b/graphics/tileset_anims/anim_1_3.bin
diff --git a/graphics/tileset_anims/aim_1_4.bin b/graphics/tileset_anims/anim_1_4.bin
index d5d005d28..d5d005d28 100644
--- a/graphics/tileset_anims/aim_1_4.bin
+++ b/graphics/tileset_anims/anim_1_4.bin
diff --git a/graphics/tileset_anims/aim_1_5.bin b/graphics/tileset_anims/anim_1_5.bin
index 4e5e0e247..4e5e0e247 100644
--- a/graphics/tileset_anims/aim_1_5.bin
+++ b/graphics/tileset_anims/anim_1_5.bin
diff --git a/graphics/tileset_anims/aim_1_6.bin b/graphics/tileset_anims/anim_1_6.bin
index bb716829f..bb716829f 100644
--- a/graphics/tileset_anims/aim_1_6.bin
+++ b/graphics/tileset_anims/anim_1_6.bin
diff --git a/graphics/tileset_anims/aim_1_7.bin b/graphics/tileset_anims/anim_1_7.bin
index c49e57e7f..c49e57e7f 100644
--- a/graphics/tileset_anims/aim_1_7.bin
+++ b/graphics/tileset_anims/anim_1_7.bin
diff --git a/graphics/tileset_anims/aim_2_0.bin b/graphics/tileset_anims/anim_2_0.bin
index e9225fe58..e9225fe58 100644
--- a/graphics/tileset_anims/aim_2_0.bin
+++ b/graphics/tileset_anims/anim_2_0.bin
diff --git a/graphics/tileset_anims/aim_2_1.bin b/graphics/tileset_anims/anim_2_1.bin
index 74424fff9..74424fff9 100644
--- a/graphics/tileset_anims/aim_2_1.bin
+++ b/graphics/tileset_anims/anim_2_1.bin
diff --git a/graphics/tileset_anims/aim_2_2.bin b/graphics/tileset_anims/anim_2_2.bin
index 7b2e609c3..7b2e609c3 100644
--- a/graphics/tileset_anims/aim_2_2.bin
+++ b/graphics/tileset_anims/anim_2_2.bin
diff --git a/graphics/tileset_anims/aim_2_3.bin b/graphics/tileset_anims/anim_2_3.bin
index 85db3d2df..85db3d2df 100644
--- a/graphics/tileset_anims/aim_2_3.bin
+++ b/graphics/tileset_anims/anim_2_3.bin
diff --git a/graphics/tileset_anims/aim_2_4.bin b/graphics/tileset_anims/anim_2_4.bin
index c350f70ec..c350f70ec 100644
--- a/graphics/tileset_anims/aim_2_4.bin
+++ b/graphics/tileset_anims/anim_2_4.bin
diff --git a/graphics/tileset_anims/aim_2_5.bin b/graphics/tileset_anims/anim_2_5.bin
index 71636ac22..71636ac22 100644
--- a/graphics/tileset_anims/aim_2_5.bin
+++ b/graphics/tileset_anims/anim_2_5.bin
diff --git a/graphics/tileset_anims/aim_2_6.bin b/graphics/tileset_anims/anim_2_6.bin
index 79e125e62..79e125e62 100644
--- a/graphics/tileset_anims/aim_2_6.bin
+++ b/graphics/tileset_anims/anim_2_6.bin
diff --git a/graphics/tileset_anims/aim_2_7.bin b/graphics/tileset_anims/anim_2_7.bin
index 1df096dbc..1df096dbc 100644
--- a/graphics/tileset_anims/aim_2_7.bin
+++ b/graphics/tileset_anims/anim_2_7.bin
diff --git a/graphics/tileset_anims/aim_3_0.bin b/graphics/tileset_anims/anim_3_0.bin
index 6a911444b..6a911444b 100644
--- a/graphics/tileset_anims/aim_3_0.bin
+++ b/graphics/tileset_anims/anim_3_0.bin
diff --git a/graphics/tileset_anims/aim_3_1.bin b/graphics/tileset_anims/anim_3_1.bin
index a66f3382d..a66f3382d 100644
--- a/graphics/tileset_anims/aim_3_1.bin
+++ b/graphics/tileset_anims/anim_3_1.bin
diff --git a/graphics/tileset_anims/aim_3_2.bin b/graphics/tileset_anims/anim_3_2.bin
index ed7890e83..ed7890e83 100644
--- a/graphics/tileset_anims/aim_3_2.bin
+++ b/graphics/tileset_anims/anim_3_2.bin
diff --git a/graphics/tileset_anims/aim_3_3.bin b/graphics/tileset_anims/anim_3_3.bin
index 5cfdc3ebd..5cfdc3ebd 100644
--- a/graphics/tileset_anims/aim_3_3.bin
+++ b/graphics/tileset_anims/anim_3_3.bin
diff --git a/graphics/tileset_anims/aim_3_4.bin b/graphics/tileset_anims/anim_3_4.bin
index 83dc605ff..83dc605ff 100644
--- a/graphics/tileset_anims/aim_3_4.bin
+++ b/graphics/tileset_anims/anim_3_4.bin
diff --git a/graphics/tileset_anims/aim_4_0.bin b/graphics/tileset_anims/anim_4_0.bin
index 462cf8168..462cf8168 100644
--- a/graphics/tileset_anims/aim_4_0.bin
+++ b/graphics/tileset_anims/anim_4_0.bin
diff --git a/graphics/tileset_anims/aim_4_1.bin b/graphics/tileset_anims/anim_4_1.bin
index eeccebb35..eeccebb35 100644
--- a/graphics/tileset_anims/aim_4_1.bin
+++ b/graphics/tileset_anims/anim_4_1.bin
diff --git a/graphics/tileset_anims/aim_4_2.bin b/graphics/tileset_anims/anim_4_2.bin
index 3808d0b82..3808d0b82 100644
--- a/graphics/tileset_anims/aim_4_2.bin
+++ b/graphics/tileset_anims/anim_4_2.bin
diff --git a/graphics/tileset_anims/aim_4_3.bin b/graphics/tileset_anims/anim_4_3.bin
index 45374b4aa..45374b4aa 100644
--- a/graphics/tileset_anims/aim_4_3.bin
+++ b/graphics/tileset_anims/anim_4_3.bin
diff --git a/graphics/tileset_anims/aim_5_0.bin b/graphics/tileset_anims/anim_5_0.bin
index face13a75..face13a75 100644
--- a/graphics/tileset_anims/aim_5_0.bin
+++ b/graphics/tileset_anims/anim_5_0.bin
diff --git a/graphics/tileset_anims/aim_5_1.bin b/graphics/tileset_anims/anim_5_1.bin
index f1a93897e..f1a93897e 100644
--- a/graphics/tileset_anims/aim_5_1.bin
+++ b/graphics/tileset_anims/anim_5_1.bin
diff --git a/graphics/tileset_anims/aim_5_2.bin b/graphics/tileset_anims/anim_5_2.bin
index d63cdc5fc..d63cdc5fc 100644
--- a/graphics/tileset_anims/aim_5_2.bin
+++ b/graphics/tileset_anims/anim_5_2.bin
diff --git a/graphics/tileset_anims/aim_5_3.bin b/graphics/tileset_anims/anim_5_3.bin
index 0c396ccbe..0c396ccbe 100644
--- a/graphics/tileset_anims/aim_5_3.bin
+++ b/graphics/tileset_anims/anim_5_3.bin
diff --git a/graphics/tileset_anims/aim_6_0.bin b/graphics/tileset_anims/anim_6_0.bin
index 8bdac939e..8bdac939e 100644
--- a/graphics/tileset_anims/aim_6_0.bin
+++ b/graphics/tileset_anims/anim_6_0.bin
diff --git a/graphics/tileset_anims/aim_6_1.bin b/graphics/tileset_anims/anim_6_1.bin
index cd2e32723..cd2e32723 100644
--- a/graphics/tileset_anims/aim_6_1.bin
+++ b/graphics/tileset_anims/anim_6_1.bin
diff --git a/graphics/tileset_anims/aim_7_0.bin b/graphics/tileset_anims/anim_7_0.bin
index f94617c73..f94617c73 100644
--- a/graphics/tileset_anims/aim_7_0.bin
+++ b/graphics/tileset_anims/anim_7_0.bin
diff --git a/graphics/tileset_anims/aim_7_1.bin b/graphics/tileset_anims/anim_7_1.bin
index ac59368ca..ac59368ca 100644
--- a/graphics/tileset_anims/aim_7_1.bin
+++ b/graphics/tileset_anims/anim_7_1.bin
diff --git a/graphics/tileset_anims/aim_7_2.bin b/graphics/tileset_anims/anim_7_2.bin
index 9dd915040..9dd915040 100644
--- a/graphics/tileset_anims/aim_7_2.bin
+++ b/graphics/tileset_anims/anim_7_2.bin
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,