Revert BG_CHAR_ADDR replacements in tileset_anims.c

This commit is contained in:
PikalaxALT
2021-06-03 12:49:25 -04:00
parent ffb21d41b5
commit 88e3ff0e39
+8 -8
View File
@@ -207,17 +207,17 @@ static void _InitSecondaryTilesetAnimation(void)
static void QueueAnimTiles_General_Flower(u16 timer)
{
AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % NELEMS(sTilesetAnims_General_Flower)], (u16 *)(BG_CHAR_ADDR(0) + TILE_OFFSET_4BPP(508)), 4 * TILE_SIZE_4BPP);
AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % NELEMS(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_CHAR_ADDR(0) + TILE_OFFSET_4BPP(416)), 48 * TILE_SIZE_4BPP);
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 QueueAnimTiles_General_SandWatersEdge(u16 timer)
{
AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % NELEMS(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_CHAR_ADDR(0) + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP);
AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % NELEMS(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP);
}
static void TilesetAnim_General(u16 timer)
@@ -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_CHAR_ADDR(1) + TILE_OFFSET_4BPP(232)), 8 * TILE_SIZE_4BPP);
AppendTilesetAnimToBuffer(sTilesetAnims_CeladonCity_Fountain[timer % NELEMS(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_CHAR_ADDR(1) + TILE_OFFSET_4BPP(464)), 8 * TILE_SIZE_4BPP);
AppendTilesetAnimToBuffer(sTilesetAnims_SilphCo_Fountain[timer % NELEMS(sTilesetAnims_SilphCo_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 8 * TILE_SIZE_4BPP);
}
static void TilesetAnim_SilphCo(u16 timer)
@@ -275,7 +275,7 @@ void InitTilesetAnim_SilphCo(void)
static void QueueAnimTiles_MtEmber_Steam(u16 timer)
{
AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % NELEMS(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(384)), 8 * TILE_SIZE_4BPP);
AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % NELEMS(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 8 * TILE_SIZE_4BPP);
}
static void TilesetAnim_MtEmber(u16 timer)
@@ -295,7 +295,7 @@ static void QueueAnimTiles_VermilionGym_MotorizedDoor(u16 timer)
{
u16 i = timer % NELEMS(sTilesetAnims_VermilionGym_MotorizedDoor);
AppendTilesetAnimToBuffer(sTilesetAnims_VermilionGym_MotorizedDoor[i], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(368)), 7 * TILE_SIZE_4BPP);
AppendTilesetAnimToBuffer(sTilesetAnims_VermilionGym_MotorizedDoor[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 7 * TILE_SIZE_4BPP);
}
static void TilesetAnim_VermilionGym(u16 timer)
@@ -315,7 +315,7 @@ static void QueueAnimTiles_CeladonGym_Flowers(u16 timer)
{
u16 i = timer % NELEMS(sTilesetAnims_CeladonGym_Flowers);
AppendTilesetAnimToBuffer(sTilesetAnims_CeladonGym_Flowers[i], (u16 *)(BG_CHAR_ADDR(1) + TILE_OFFSET_4BPP(227)), 4 * TILE_SIZE_4BPP);
AppendTilesetAnimToBuffer(sTilesetAnims_CeladonGym_Flowers[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 4 * TILE_SIZE_4BPP);
}
static void TilesetAnim_CeladonGym(u16 timer)