ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use macros and defines in tileset_anims

Browse Source
This commit is contained in:
Diegoisawesome 2018-09-22 15:02:49 -05:00
parent f613176308
commit d50554bb8e
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/gba/defines.h
View File

@ -61,6 +61,9 @@
#define TILE_SIZE_4BPP 32 #define TILE_SIZE_4BPP 32
#define TILE_SIZE_8BPP 64 #define TILE_SIZE_8BPP 64
#define TILE_OFFSET_4BPP(n) ((n) * TILE_SIZE_4BPP)
#define TILE_OFFSET_8BPP(n) ((n) * TILE_SIZE_8BPP)
#define TOTAL_OBJ_TILE_COUNT 1024 #define TOTAL_OBJ_TILE_COUNT 1024
#define WIN_RANGE(a, b) (((a) << 8) | (b)) #define WIN_RANGE(a, b) (((a) << 8) | (b))

55
src/tileset_anims.c
View File

@ -6,6 +6,7 @@
#include "battle_transition.h" #include "battle_transition.h"
#include "task.h" #include "task.h"
#include "battle_transition.h" #include "battle_transition.h"
#include "fieldmap.h"
// Static type declarations // Static type declarations
@ -750,7 +751,7 @@ static void sub_80A0BCC(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + 0x3F80), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80);
} }
static void sub_80A0BF4(u16 timer) static void sub_80A0BF4(u16 timer)
@ -758,7 +759,7 @@ static void sub_80A0BF4(u16 timer)
u8 idx; u8 idx;
idx = timer % 8; idx = timer % 8;
AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + 0x3600), 0x3C0); AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0);
} }
static void sub_80A0C1C(u16 timer) static void sub_80A0C1C(u16 timer)
@ -766,7 +767,7 @@ static void sub_80A0C1C(u16 timer)
u16 idx; u16 idx;
idx = timer % 8; idx = timer % 8;
AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + 0x3a00), 0x140); AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140);
} }
static void sub_80A0C44(u16 timer) static void sub_80A0C44(u16 timer)
@ -774,7 +775,7 @@ static void sub_80A0C44(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_General3[idx], (u16 *)(BG_VRAM + 0x3e00), 0xc0); AppendTilesetAnimToBuffer(gTilesetAnims_General3[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0xc0);
} }
void TilesetCb_Petalburg(void) void TilesetCb_Petalburg(void)
@ -1127,7 +1128,7 @@ static void sub_80A12AC(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_General4[idx], (u16 *)(BG_VRAM + 0x3c00), 0x140); AppendTilesetAnimToBuffer(gTilesetAnims_General4[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(480)), 0x140);
} }
static void sub_80A12D4(u8 timer) static void sub_80A12D4(u8 timer)
@ -1135,10 +1136,10 @@ static void sub_80A12D4(u8 timer)
u8 idx; u8 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + 0x6400), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 288)), 0x80);
idx = (timer + 2) % 4; idx = (timer + 2) % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + 0x6480), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 292)), 0x80);
} }
static void sub_80A131C(u8 timer) static void sub_80A131C(u8 timer)
@ -1146,7 +1147,7 @@ static void sub_80A131C(u8 timer)
u8 idx; u8 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog0[idx], (u16 *)(BG_VRAM + 0x7a00), 0x3C0); AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x3C0);
} }
static void sub_80A1344(u8 timer) static void sub_80A1344(u8 timer)
@ -1154,7 +1155,7 @@ static void sub_80A1344(u8 timer)
u8 idx; u8 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_Underwater0[idx], (u16 *)(BG_VRAM + 0x7e00), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_Underwater0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x80);
} }
static void sub_80A136C(u8 timer) static void sub_80A136C(u8 timer)
@ -1162,7 +1163,7 @@ static void sub_80A136C(u8 timer)
u8 idx; u8 idx;
idx = timer % 8; idx = timer % 8;
AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog1[idx], (u16 *)(BG_VRAM + 0x7e00), 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) static void sub_80A1394(u16 timer_div, u8 timer_mod)
@ -1195,7 +1196,7 @@ static void sub_80A1470(u16 timer)
u16 idx; u16 idx;
idx = timer % 2; idx = timer % 2;
AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro1[idx], (u16 *)(BG_VRAM + 0x7800), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 448)), 0x80);
} }
static void sub_80A1498(u16 timer) static void sub_80A1498(u16 timer)
@ -1203,7 +1204,7 @@ static void sub_80A1498(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + 0x5400), 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) static void sub_80A14C0(u16 timer_div, u8 timer_mod)
@ -1219,7 +1220,7 @@ static void sub_80A14F8(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + 0x7400), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 416)), 0x80);
} }
static void sub_80A1520(u16 timer) static void sub_80A1520(u16 timer)
@ -1227,7 +1228,7 @@ static void sub_80A1520(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_Dewford0[idx], (u16 *)(BG_VRAM + 0x5540), 0xC0); AppendTilesetAnimToBuffer(gTilesetAnims_Dewford0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 170)), 0xC0);
} }
static void sub_80A1548(u16 timer) static void sub_80A1548(u16 timer)
@ -1235,7 +1236,7 @@ static void sub_80A1548(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest0[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0); AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0);
} }
static void sub_80A1570(u16 timer) static void sub_80A1570(u16 timer)
@ -1243,7 +1244,7 @@ static void sub_80A1570(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast0[idx], (u16 *)(BG_VRAM + 0x5b40), 0xC0); AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0);
} }
static void sub_80A1598(u16 timer) static void sub_80A1598(u16 timer)
@ -1251,7 +1252,7 @@ static void sub_80A1598(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_Slateport0[idx], (u16 *)(BG_VRAM + 0x5c00), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_Slateport0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), 0x80);
} }
static void sub_80A15C0(u16 timer) static void sub_80A15C0(u16 timer)
@ -1321,7 +1322,7 @@ static void sub_80A1688(u16 timer)
u16 idx; u16 idx;
idx = timer % 2; idx = timer % 2;
AppendTilesetAnimToBuffer(gTilesetAnims_InsideBuilding0[idx], (u16 *)(BG_VRAM + 0x3e00), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_InsideBuilding0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0x80);
} }
static void sub_80A16B0(u16 timer) static void sub_80A16B0(u16 timer)
@ -1329,8 +1330,8 @@ static void sub_80A16B0(u16 timer)
u16 idx; u16 idx;
idx = timer % 3; idx = timer % 3;
AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym0[idx], (u16 *)(BG_VRAM + 0x7e00), 0x180); AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x180);
AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym1[idx], (u16 *)(BG_VRAM + 0x7a00), 0x280); AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x280);
} }
static void sub_80A16F8(u16 timer) static void sub_80A16F8(u16 timer)
@ -1338,7 +1339,7 @@ static void sub_80A16F8(u16 timer)
u16 idx; u16 idx;
idx = timer % 4; idx = timer % 4;
AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour1[idx], (u16 *)(BG_VRAM + 0x7f00), 0x20); AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 504)), 0x20);
} }
static void sub_80A1720(u16 timer) static void sub_80A1720(u16 timer)
@ -1346,7 +1347,7 @@ static void sub_80A1720(u16 timer)
u16 idx; u16 idx;
idx = timer % 2; idx = timer % 2;
AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour0[idx], (u16 *)(BG_VRAM + 0x7c00), 0x80); AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 480)), 0x80);
} }
static void sub_80A1748(u16 timer) static void sub_80A1748(u16 timer)
@ -1354,7 +1355,7 @@ static void sub_80A1748(u16 timer)
u16 idx; u16 idx;
idx = timer % 2; idx = timer % 2;
AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym0[idx], (u16 *)(BG_VRAM + 0x5200), 0x200); AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 144)), 0x200);
} }
static void sub_80A1770(u16 timer) static void sub_80A1770(u16 timer)
@ -1362,7 +1363,7 @@ static void sub_80A1770(u16 timer)
u16 idx; u16 idx;
idx = timer % 2; idx = timer % 2;
AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop0[idx], (u16 *)(BG_VRAM + 0x7e00), 0x120); AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x120);
} }
static void sub_80A1798(u16 timer) static void sub_80A1798(u16 timer)
@ -1370,7 +1371,7 @@ static void sub_80A1798(u16 timer)
u16 idx; u16 idx;
idx = timer % 8; idx = timer % 8;
AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis0[idx], (u16 *)(BG_VRAM + 0x5e00), 0xc00); AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 240)), 0xc00);
} }
static void sub_80A17C0(u16 timer) static void sub_80A17C0(u16 timer)
@ -1378,7 +1379,7 @@ static void sub_80A17C0(u16 timer)
u16 idx; u16 idx;
idx = timer % 3; idx = timer % 3;
AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid0[idx], (u16 *)(BG_VRAM + 0x52e0), 0x100); AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 151)), 0x100);
} }
static void sub_80A17EC(u16 timer) static void sub_80A17EC(u16 timer)
@ -1386,7 +1387,7 @@ static void sub_80A17EC(u16 timer)
u16 idx; u16 idx;
idx = timer % 3; idx = timer % 3;
AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid1[idx], (u16 *)(BG_VRAM + 0x50e0), 0x100); AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 135)), 0x100);
} }
static void sub_80A1818(u16 a1) static void sub_80A1818(u16 a1)