From 5fe91ae57768e97fabf8d87393182d6bf628e072 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Mon, 3 May 2021 22:08:37 -0400 Subject: [PATCH] [nostalgia/core/gba] Remove now unnecessary casts --- src/nostalgia/core/gba/gfx.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nostalgia/core/gba/gfx.cpp b/src/nostalgia/core/gba/gfx.cpp index 3ef65965a..65b39e8da 100644 --- a/src/nostalgia/core/gba/gfx.cpp +++ b/src/nostalgia/core/gba/gfx.cpp @@ -172,12 +172,12 @@ ox::Error loadBgTileSheet(Context *ctx, target.pal.palette = &MEM_BG_PALETTE[section]; target.bgCtl = &bgCtl(section); target.tileMap = &ox::bit_cast(MEM_BG_TILES)[section * 512]; - oxReturnError(ox::readMC(ox::bit_cast(ts), tsStat.size, &target)); + oxReturnError(ox::readMC(ts, tsStat.size, &target)); // load external palette if available if (paletteAddr) { oxRequire(palStat, ctx->rom->stat(paletteAddr)); oxRequire(pal, ctx->rom->directAccess(paletteAddr)); - oxReturnError(ox::readMC(ox::bit_cast(pal), palStat.size, &target.pal)); + oxReturnError(ox::readMC(pal, palStat.size, &target.pal)); } return OxError(0); } @@ -193,12 +193,12 @@ ox::Error loadSpriteTileSheet(Context *ctx, // Is this needed? Should this be written to an equivalent sprite value? // target.bgCtl = &bgCtl(section); target.tileMap = &ox::bit_cast(MEM_SPRITE_TILES)[section * 512]; - oxReturnError(ox::readMC(ox::bit_cast(ts), tsStat.size, &target)); + oxReturnError(ox::readMC(ts, tsStat.size, &target)); // load external palette if available if (paletteAddr) { oxRequire(palStat, ctx->rom->stat(paletteAddr)); oxRequire(pal, ctx->rom->directAccess(paletteAddr)); - oxReturnError(ox::readMC(ox::bit_cast(pal), palStat.size, &target.pal)); + oxReturnError(ox::readMC(pal, palStat.size, &target.pal)); } return OxError(0); } @@ -208,7 +208,7 @@ ox::Error loadBgPalette(Context *ctx, int section, const ox::FileAddress &palett target.palette = &MEM_BG_PALETTE[section]; oxRequire(palStat, ctx->rom->stat(paletteAddr)); oxRequire(pal, ctx->rom->directAccess(paletteAddr)); - oxReturnError(ox::readMC(ox::bit_cast(pal), palStat.size, &target)); + oxReturnError(ox::readMC(pal, palStat.size, &target)); return OxError(0); } @@ -217,7 +217,7 @@ ox::Error loadSpritePalette(Context *ctx, int section, const ox::FileAddress &pa target.palette = &MEM_SPRITE_PALETTE[section]; oxRequire(palStat, ctx->rom->stat(paletteAddr)); oxRequire(pal, ctx->rom->directAccess(paletteAddr)); - oxReturnError(ox::readMC(ox::bit_cast(pal), palStat.size, &target)); + oxReturnError(ox::readMC(pal, palStat.size, &target)); return OxError(0); }