summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tileset_anims.c85
1 files changed, 43 insertions, 42 deletions
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index 3430b9e13..7f7a8a3c4 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -5,6 +5,7 @@
#include "battle_transition.h"
#include "task.h"
#include "battle_transition.h"
+#include "fieldmap.h"
#define SECONDARY_TILESET_VRAM 0x2000
#define TILE_VRAM(n) (0x20 * (n))
@@ -721,22 +722,22 @@ void TilesetCb_InsideBuilding(void)
static void sub_80A0B70(u16 timer)
{
- static void gTilesetAnims_GeneralVDests0(u16);
- static void gTilesetAnims_GeneralVDests1(u16);
- static void gTilesetAnims_GeneralVDests2(u16);
- static void gTilesetAnims_GeneralVDests3(u16);
- static void gTilesetAnims_GeneralVDests4 (u16);
+ static void gTilesetAnims_Flower(u16);
+ static void gTilesetAnims_Water(u16);
+ static void gTilesetAnims_SandWaterEdge(u16);
+ static void gTilesetAnims_Waterfall(u16);
+ static void gTilesetAnims_LandWaterEdge (u16);
if ((timer & 0x0F) == 0)
- gTilesetAnims_GeneralVDests0(timer >> 4);
+ gTilesetAnims_Flower(timer >> 4);
if ((timer & 0x0F) == 1)
- gTilesetAnims_GeneralVDests1(timer >> 4);
+ gTilesetAnims_Water(timer >> 4);
if ((timer & 0x0F) == 2)
- gTilesetAnims_GeneralVDests2(timer >> 4);
+ gTilesetAnims_SandWaterEdge(timer >> 4);
if ((timer & 0x0F) == 3)
- gTilesetAnims_GeneralVDests3(timer >> 4);
+ gTilesetAnims_Waterfall(timer >> 4);
if ((timer & 0x0F) == 4)
- gTilesetAnims_GeneralVDests4 (timer >> 4);
+ gTilesetAnims_LandWaterEdge (timer >> 4);
}
static void sub_80A0BB4(u16 timer)
@@ -747,36 +748,36 @@ static void sub_80A0BB4(u16 timer)
sub_80A1688(timer >> 3);
}
-static void gTilesetAnims_GeneralVDests0(u16 timer)
+static void gTilesetAnims_Flower(u16 timer)
{
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x1FC)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80);
}
-static void gTilesetAnims_GeneralVDests1(u16 timer)
+static void gTilesetAnims_Water(u16 timer)
{
u8 idx;
idx = timer % 8;
- AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x1B0)), 0x3C0);
+ AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0);
}
-static void gTilesetAnims_GeneralVDests2(u16 timer)
+static void gTilesetAnims_SandWaterEdge(u16 timer)
{
u16 idx;
idx = timer % 8;
- AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x1D0)), 0x140);
+ AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140);
}
-static void gTilesetAnims_GeneralVDests3(u16 timer)
+static void gTilesetAnims_Waterfall(u16 timer)
{
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_General3[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x1F0)), 0xc0);
+ AppendTilesetAnimToBuffer(gTilesetAnims_General3[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0xc0);
}
void TilesetCb_Petalburg(void)
@@ -1124,12 +1125,12 @@ static void sub_80A1294(u16 timer)
sub_80A1570(timer >> 3);
}
-static void gTilesetAnims_GeneralVDests4 (u16 timer)
+static void gTilesetAnims_LandWaterEdge (u16 timer)
{
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_General4[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x1E0)), 0x140);
+ AppendTilesetAnimToBuffer(gTilesetAnims_General4[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(480)), 0x140);
}
static void sub_80A12D4(u8 timer)
@@ -1137,10 +1138,10 @@ static void sub_80A12D4(u8 timer)
u8 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x320)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 288)), 0x80);
idx = (timer + 2) % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x324)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 292)), 0x80);
}
static void sub_80A131C(u8 timer)
@@ -1148,7 +1149,7 @@ static void sub_80A131C(u8 timer)
u8 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3D0)), 0x3C0);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x3C0);
}
static void sub_80A1344(u8 timer)
@@ -1156,7 +1157,7 @@ static void sub_80A1344(u8 timer)
u8 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_Underwater0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3F0)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Underwater0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x80);
}
static void sub_80A136C(u8 timer)
@@ -1164,7 +1165,7 @@ static void sub_80A136C(u8 timer)
u8 idx;
idx = timer % 8;
- AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog1[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3F0)), 0x100);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x100);
}
static void sub_80A1394(u16 timer_div, u8 timer_mod)
@@ -1197,7 +1198,7 @@ static void sub_80A1470(u16 timer)
u16 idx;
idx = timer % 2;
- AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro1[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3C0)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 448)), 0x80);
}
static void sub_80A1498(u16 timer)
@@ -1205,7 +1206,7 @@ static void sub_80A1498(u16 timer)
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x2A0)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 160)), 0x80);
}
static void sub_80A14C0(u16 timer_div, u8 timer_mod)
@@ -1221,7 +1222,7 @@ static void sub_80A14F8(u16 timer)
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3A0)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 416)), 0x80);
}
static void sub_80A1520(u16 timer)
@@ -1229,7 +1230,7 @@ static void sub_80A1520(u16 timer)
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_Dewford0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x2AA)), 0xC0);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Dewford0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 170)), 0xC0);
}
static void sub_80A1548(u16 timer)
@@ -1237,7 +1238,7 @@ static void sub_80A1548(u16 timer)
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x2DA)), 0xC0);
+ AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0);
}
static void sub_80A1570(u16 timer)
@@ -1245,7 +1246,7 @@ static void sub_80A1570(u16 timer)
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x2DA)), 0xC0);
+ AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0);
}
static void sub_80A1598(u16 timer)
@@ -1253,7 +1254,7 @@ static void sub_80A1598(u16 timer)
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_Slateport0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x2E0)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Slateport0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), 0x80);
}
static void sub_80A15C0(u16 timer)
@@ -1323,7 +1324,7 @@ static void sub_80A1688(u16 timer)
u16 idx;
idx = timer % 2;
- AppendTilesetAnimToBuffer(gTilesetAnims_InsideBuilding0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x1F0)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_InsideBuilding0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0x80);
}
static void sub_80A16B0(u16 timer)
@@ -1331,8 +1332,8 @@ static void sub_80A16B0(u16 timer)
u16 idx;
idx = timer % 3;
- AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3F0)), 0x180);
- AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym1[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3D0)), 0x280);
+ AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x180);
+ AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x280);
}
static void sub_80A16F8(u16 timer)
@@ -1340,7 +1341,7 @@ static void sub_80A16F8(u16 timer)
u16 idx;
idx = timer % 4;
- AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour1[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3F8)), 0x20);
+ AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 504)), 0x20);
}
static void sub_80A1720(u16 timer)
@@ -1348,7 +1349,7 @@ static void sub_80A1720(u16 timer)
u16 idx;
idx = timer % 2;
- AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3E0)), 0x80);
+ AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 480)), 0x80);
}
static void sub_80A1748(u16 timer)
@@ -1356,7 +1357,7 @@ static void sub_80A1748(u16 timer)
u16 idx;
idx = timer % 2;
- AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x290)), 0x200);
+ AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 144)), 0x200);
}
static void sub_80A1770(u16 timer)
@@ -1364,7 +1365,7 @@ static void sub_80A1770(u16 timer)
u16 idx;
idx = timer % 2;
- AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x3F0)), 0x120);
+ AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x120);
}
static void sub_80A1798(u16 timer)
@@ -1372,7 +1373,7 @@ static void sub_80A1798(u16 timer)
u16 idx;
idx = timer % 8;
- AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x2F0)), 0xc00);
+ AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 240)), 0xc00);
}
static void sub_80A17C0(u16 timer)
@@ -1380,7 +1381,7 @@ static void sub_80A17C0(u16 timer)
u16 idx;
idx = timer % 3;
- AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid0[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x297)), 0x100);
+ AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 151)), 0x100);
}
static void sub_80A17EC(u16 timer)
@@ -1388,7 +1389,7 @@ static void sub_80A17EC(u16 timer)
u16 idx;
idx = timer % 3;
- AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid1[idx], (u16 *)(BG_VRAM + TILE_VRAM(0x287)), 0x100);
+ AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 135)), 0x100);
}
static void sub_80A1818(u16 a1)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 06:44:25 +0000