diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 12:49:25 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 12:49:25 -0400 |
| commit | 88e3ff0e39b337ffe401922726fa2b3afa2287c4 (patch) | |
| tree | 8a417f4f7143d6e36f4d9015ce33459169934a9c /src | |
| parent | ffb21d41b58f8c51006f656344c37cb43cf60f83 (diff) | |
Revert BG_CHAR_ADDR replacements in tileset_anims.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/tileset_anims.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tileset_anims.c b/src/tileset_anims.c index bedd19445..abd0d80e1 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -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) |