diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index fcf6a6038..04854a2e4 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -80,7 +80,7 @@ static const u16 sTilesetAnims_CeladonCity_Fountain_Frame1[] = INCBIN_U16("data/
 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 sTilesetAnims_CeladonCity_Fountain_Empty[16] = {};
 
 static const u16 *const sTilesetAnims_CeladonCity_Fountain[] = {
     sTilesetAnims_CeladonCity_Fountain_Frame0,
@@ -94,7 +94,7 @@ static const u16 sTilesetAnims_SilphCo_Fountain_Frame0[] = INCBIN_U16("data/tile
 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 sTilesetAnims_SilphCo_Fountain_Empty[16] = {};
 
 static const u16 *const sTilesetAnims_SilphCo_Fountain[] = {
     sTilesetAnims_SilphCo_Fountain_Frame0,
@@ -207,27 +207,27 @@ static void _InitSecondaryTilesetAnimation(void)
 
 static void QueueAnimTiles_General_Flower(u16 timer)
 {
-    AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % NELEMS(sTilesetAnims_General_Flower)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 4 * TILE_SIZE_4BPP);
+    AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % ARRAY_COUNT(sTilesetAnims_General_Flower)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 4 * TILE_SIZE_4BPP);
 }
 
 static void QueueAnimTiles_General_Water_Current_LandWatersEdge(u16 timer)
 {
-    AppendTilesetAnimToBuffer(sTilesetAnims_General_Water_Current_LandWatersEdge[timer % NELEMS(sTilesetAnims_General_Water_Current_LandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 48 * TILE_SIZE_4BPP);
+    AppendTilesetAnimToBuffer(sTilesetAnims_General_Water_Current_LandWatersEdge[timer % ARRAY_COUNT(sTilesetAnims_General_Water_Current_LandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 48 * TILE_SIZE_4BPP);
 }
 
 static void QueueAnimTiles_General_SandWatersEdge(u16 timer)
 {
-    AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % NELEMS(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP);
+    AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % ARRAY_COUNT(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP);
 }
 
 static void TilesetAnim_General(u16 timer)
 {
     if (timer % 8 == 0)
-        QueueAnimTiles_General_SandWatersEdge(timer >> 3);
+        QueueAnimTiles_General_SandWatersEdge(timer / 8);
     if (timer % 16 == 1)
-        QueueAnimTiles_General_Water_Current_LandWatersEdge(timer >> 4);
+        QueueAnimTiles_General_Water_Current_LandWatersEdge(timer / 16);
     if (timer % 16 == 2)
-        QueueAnimTiles_General_Flower(timer >> 4);
+        QueueAnimTiles_General_Flower(timer / 16);
 }
 
 void InitTilesetAnim_General(void)
@@ -239,7 +239,7 @@ void InitTilesetAnim_General(void)
 
 static void QueueAnimTiles_CeladonCity_Fountain(u16 timer)
 {
-    AppendTilesetAnimToBuffer(sTilesetAnims_CeladonCity_Fountain[timer % NELEMS(sTilesetAnims_CeladonCity_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 8 * TILE_SIZE_4BPP);
+    AppendTilesetAnimToBuffer(sTilesetAnims_CeladonCity_Fountain[timer % ARRAY_COUNT(sTilesetAnims_CeladonCity_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 8 * TILE_SIZE_4BPP);
 }
 
 static void TilesetAnim_CeladonCity(u16 timer)
@@ -257,7 +257,7 @@ void InitTilesetAnim_CeladonCity(void)
 
 static void QueueAnimTiles_SilphCo_Fountain(u16 timer)
 {
-    AppendTilesetAnimToBuffer(sTilesetAnims_SilphCo_Fountain[timer % NELEMS(sTilesetAnims_SilphCo_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 8 * TILE_SIZE_4BPP);
+    AppendTilesetAnimToBuffer(sTilesetAnims_SilphCo_Fountain[timer % ARRAY_COUNT(sTilesetAnims_SilphCo_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 8 * TILE_SIZE_4BPP);
 }
 
 static void TilesetAnim_SilphCo(u16 timer)
@@ -275,13 +275,13 @@ void InitTilesetAnim_SilphCo(void)
 
 static void QueueAnimTiles_MtEmber_Steam(u16 timer)
 {
-    AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % NELEMS(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 8 * TILE_SIZE_4BPP);
+    AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % ARRAY_COUNT(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 8 * TILE_SIZE_4BPP);
 }
 
 static void TilesetAnim_MtEmber(u16 timer)
 {
     if (timer % 16 == 0)
-        QueueAnimTiles_MtEmber_Steam(timer >> 4);
+        QueueAnimTiles_MtEmber_Steam(timer / 16);
 }
 
 void InitTilesetAnim_MtEmber(void)
@@ -293,7 +293,7 @@ void InitTilesetAnim_MtEmber(void)
 
 static void QueueAnimTiles_VermilionGym_MotorizedDoor(u16 timer)
 {
-    u16 i = timer % NELEMS(sTilesetAnims_VermilionGym_MotorizedDoor);
+    u16 i = timer % ARRAY_COUNT(sTilesetAnims_VermilionGym_MotorizedDoor);
 
     AppendTilesetAnimToBuffer(sTilesetAnims_VermilionGym_MotorizedDoor[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 7 * TILE_SIZE_4BPP);
 }
@@ -301,7 +301,7 @@ static void QueueAnimTiles_VermilionGym_MotorizedDoor(u16 timer)
 static void TilesetAnim_VermilionGym(u16 timer)
 {
     if (timer % 2 == 0)
-        QueueAnimTiles_VermilionGym_MotorizedDoor(timer >> 1);
+        QueueAnimTiles_VermilionGym_MotorizedDoor(timer / 2);
 }
 
 void InitTilesetAnim_VermilionGym(void)
@@ -313,7 +313,7 @@ void InitTilesetAnim_VermilionGym(void)
 
 static void QueueAnimTiles_CeladonGym_Flowers(u16 timer)
 {
-    u16 i = timer % NELEMS(sTilesetAnims_CeladonGym_Flowers);
+    u16 i = timer % ARRAY_COUNT(sTilesetAnims_CeladonGym_Flowers);
     
     AppendTilesetAnimToBuffer(sTilesetAnims_CeladonGym_Flowers[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 4 * TILE_SIZE_4BPP);
 }
@@ -321,7 +321,7 @@ static void QueueAnimTiles_CeladonGym_Flowers(u16 timer)
 static void TilesetAnim_CeladonGym(u16 timer)
 {
     if (timer % 16 == 0)
-        QueueAnimTiles_CeladonGym_Flowers(timer >> 4);
+        QueueAnimTiles_CeladonGym_Flowers(timer / 16);
 }
 
 void InitTilesetAnim_CeladonGym(void)