drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[nostalgia/core/studio] Remove alpha bit from PaletteEditor

Browse Source
This commit is contained in:
Gary Talent
2021-02-02 02:24:44 -06:00
parent bc8d50f3e7
commit 983a9b87d5
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/core/gba/gfx.cpp
+3 -3
View File
@@ -46,7 +46,7 @@ struct GbaTileMapTarget {
template<typename T>
ox::Error modelRead(T *io, GbaPaletteTarget *t) {
io->template setTypeInfo<GbaPaletteTarget>();
auto colorHandler = [t](std::size_t i, Color16 *c) {
const auto colorHandler = [t](std::size_t i, Color16 *c) {
t->palette[i] = *c;
return OxError(0);
};
@@ -148,9 +148,9 @@ ox::Error loadBgTileSheet(Context *ctx,
oxReturnError(ox::readMC(ts, tsStat.size, &target));
// load external palette if available
if (paletteAddr) {
auto [palStat, palStatErr] = ctx->rom->stat(paletteAddr);
const auto [palStat, palStatErr] = ctx->rom->stat(paletteAddr);
oxReturnError(palStatErr);
auto [pal, palErr] = ctx->rom->read(paletteAddr);
const auto [pal, palErr] = ctx->rom->read(paletteAddr);
oxReturnError(palErr);
oxReturnError(ox::readMC(pal, palStat.size, &target.pal));
}