From 696bae07212c626747edad22cff9d0b588cc0aea Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 25 Jun 2023 17:12:14 -0500
Subject: [PATCH] [nostalgia/core/gba] Cleanup

---
 src/nostalgia/modules/core/src/gba/gfx.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/nostalgia/modules/core/src/gba/gfx.cpp b/src/nostalgia/modules/core/src/gba/gfx.cpp
index e25281af..93f131d6 100644
--- a/src/nostalgia/modules/core/src/gba/gfx.cpp
+++ b/src/nostalgia/modules/core/src/gba/gfx.cpp
@@ -148,8 +148,9 @@ ox::Error loadSpriteTileSheet(
 		const ox::FileAddress &tilesheetAddr,
 		const ox::FileAddress &paletteAddr) noexcept {
 	auto &gctx = static_cast<GbaContext&>(*ctx);
+	auto &rom = static_cast<const ox::MemFS&>(gctx.rom());
 	oxRequire(tsStat, gctx.rom().stat(tilesheetAddr));
-	oxRequire(ts, static_cast<const ox::MemFS&>(gctx.rom()).directAccess(tilesheetAddr));
+	oxRequire(ts, rom.directAccess(tilesheetAddr));
 	GbaTileMapTarget target;
 	target.pal.palette = MEM_SPRITE_PALETTE;
 	target.tileMap = MEM_SPRITE_TILES;
@@ -157,7 +158,7 @@ ox::Error loadSpriteTileSheet(
 	// load external palette if available
 	if (paletteAddr) {
 		oxRequire(palStat, gctx.rom().stat(paletteAddr));
-		oxRequire(pal, static_cast<const ox::MemFS&>(gctx.rom()).directAccess(paletteAddr));
+		oxRequire(pal, rom.directAccess(paletteAddr));
 		oxReturnError(ox::readMC(pal, static_cast<std::size_t>(palStat.size), &target.pal));
 	}
 	return {};
@@ -165,10 +166,11 @@ ox::Error loadSpriteTileSheet(
 
 ox::Error loadBgPalette(Context *ctx, unsigned, const ox::FileAddress &paletteAddr) noexcept {
 	auto &gctx = static_cast<GbaContext&>(*ctx);
+	auto &rom = static_cast<const ox::MemFS&>(gctx.rom());
 	GbaPaletteTarget target;
 	target.palette = MEM_BG_PALETTE;
 	oxRequire(palStat, gctx.rom().stat(paletteAddr));
-	oxRequire(pal, static_cast<const ox::MemFS&>(gctx.rom()).directAccess(paletteAddr));
+	oxRequire(pal, rom.directAccess(paletteAddr));
 	oxReturnError(ox::readMC(pal, static_cast<std::size_t>(palStat.size), &target));
 	return {};
 }