Refactor GetGraphicsAddress to return uint32_t and remove unnecessary namespace

This commit is contained in:
scawful
2025-01-22 10:38:07 -05:00
parent dd9f05aeb7
commit 62e6157864

View File

@@ -27,13 +27,11 @@ namespace yaze {
using core::Renderer; using core::Renderer;
constexpr int Uncompressed3BPPSize = 0x0600; constexpr int Uncompressed3BPPSize = 0x0600;
namespace { uint32_t GetGraphicsAddress(const uint8_t *data, uint8_t addr, uint32_t ptr1,
int GetGraphicsAddress(const uint8_t *data, uint8_t addr, uint32_t ptr1, uint32_t ptr2, uint32_t ptr3) {
uint32_t ptr2, uint32_t ptr3) {
return core::SnesToPc(core::AddressFromBytes( return core::SnesToPc(core::AddressFromBytes(
data[ptr1 + addr], data[ptr2 + addr], data[ptr3 + addr])); data[ptr1 + addr], data[ptr2 + addr], data[ptr3 + addr]));
} }
} // namespace
absl::StatusOr<std::vector<uint8_t>> Load2BppGraphics(const Rom &rom) { absl::StatusOr<std::vector<uint8_t>> Load2BppGraphics(const Rom &rom) {
std::vector<uint8_t> sheet; std::vector<uint8_t> sheet;